Modified Files:

	model.cxx: Reset the database path past the whole model is loaded

diff --git a/simgear/scene/model/model.cxx b/simgear/scene/model/model.cxx
index 8db5b8e0042f44b65652f7aa0e95b708326a456d..e72554f4ac0f915b1abf6a0a502ac9bf184684cf 100644 (file)
--- a/simgear/scene/model/model.cxx
+++ b/simgear/scene/model/model.cxx
@@ -680,9 +680,6 @@ sgLoad3DModel( const string &fg_root, const string &path,
       model->setUpdateCallback(new SGSwitchUpdateCallback(sgReadCondition(prop_root, cond)));
   }
 
-  // restore old path list
-  osgDB::setDataFilePathList(pathList);
-
   if ( load_panel ) {
                                 // Load panels
     vector<SGPropertyNode_ptr> panel_nodes = props.getChildren("panel");
@@ -710,6 +707,9 @@ sgLoad3DModel( const string &fg_root, const string &path,
                      sim_time_sec, texturepath, ignore_branches);
   }
 
+  // restore old path list
+  osgDB::setDataFilePathList(pathList);
+
   return alignmainmodel;
 }