From 86ddbc7ad9d3ba9eeb4d81551fcf54f3081da97f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 25 Jun 2014 16:05:56 +0000 Subject: [PATCH] From Riccardo Corsi, "there's an inconsistency between the behavior of the method and the debug message it prints out on the console. Around line 1040 of Registry.cpp (see code below) the method returns "simpleFileName" but prints about returning "filename". In attachment the modified file, based on osg 3.2.0 ricky if(fileExists(simpleFileName)) { OSG_DEBUG << "FindFileInPath(" << filename << "): returning " << filename << std::endl; return simpleFileName; } " git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14285 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgDB/Registry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgDB/Registry.cpp b/src/osgDB/Registry.cpp index 655018773..336751c90 100644 --- a/src/osgDB/Registry.cpp +++ b/src/osgDB/Registry.cpp @@ -1041,7 +1041,7 @@ std::string Registry::findDataFileImplementation(const std::string& filename, co if(fileExists(simpleFileName)) { - OSG_DEBUG << "FindFileInPath(" << filename << "): returning " << filename << std::endl; + OSG_DEBUG << "FindFileInPath(" << filename << "): returning " << simpleFileName << std::endl; return simpleFileName; }