Improve OSG caching.

Ensure property tree is provided early to modellib.
To disable: --prop:sim/rendering/cache=0 (enabled by default)
(also requires simgear update)

diff --git a/src/Main/fgviewer.cxx b/src/Main/fgviewer.cxx
index 428bc2c328e24312261ba6d977ae89376a7b6f28..6568368050c2f5a9b94128e1b048bfaa571e3a0c 100644 (file)
--- a/src/Main/fgviewer.cxx
+++ b/src/Main/fgviewer.cxx
@@ -204,7 +204,7 @@ fgviewerMain(int argc, char** argv)
     }
 
     globals->set_matlib( new SGMaterialLib );
-    simgear::SGModelLib::init(globals->get_fg_root());
+    simgear::SGModelLib::init(globals->get_fg_root(), globals->get_props());
 
     // Initialize the material property subsystem.
 

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 33bb062bbe081950e78252babb3120cfcf214111..6c7b8a7e1ce962164d18729ac02f0fee39daaaeb 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -390,8 +390,7 @@ static void fgIdleFunction ( void ) {
         // Initialize the material manager
         ////////////////////////////////////////////////////////////////////
         globals->set_matlib( new SGMaterialLib );
-        simgear::SGModelLib::init(globals->get_fg_root());
-        simgear::SGModelLib::setPropRoot(globals->get_props());
+        simgear::SGModelLib::init(globals->get_fg_root(), globals->get_props());
         simgear::SGModelLib::setPanelFunc(load_panel);
         
         ////////////////////////////////////////////////////////////////////