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

[simgear.git] / simgear / scene / model / modellib.hxx

diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx
index 63358855b31a07a7f4a1893421713f91fa1aa92e..61091085f057900063b796ea3af929ed1153583e 100644 (file)
--- a/simgear/scene/model/modellib.hxx
+++ b/simgear/scene/model/modellib.hxx
@@ -44,10 +44,8 @@ class SGModelLib
 public:
     typedef osg::Node *(*panel_func)(SGPropertyNode *);
 
-    static void init(const std::string &root_dir);
+    static void init(const std::string &root_dir, SGPropertyNode* root);
 
-    static void setPropRoot(SGPropertyNode* root);
-    
     static void setPanelFunc(panel_func pf);
     
     // Load a 3D model (any format)