Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next

[flightgear.git] / src / Main / main.cxx

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);
         
         ////////////////////////////////////////////////////////////////////