Provide something more sensible for the properties root

for the modelLoaded call. MAy be this needs to be revisited, but in any
case better than constant zero.

Modified Files:
 	simgear/scene/model/SGPagedLOD.cxx
	simgear/scene/model/modellib.cxx

diff --git a/simgear/scene/model/SGPagedLOD.cxx b/simgear/scene/model/SGPagedLOD.cxx
index 96a0656d49917878d3dca908b0004f4db57a9c75..545aadb72b91e8d38833ba11731db8dded3d4a3c 100644 (file)
--- a/simgear/scene/model/SGPagedLOD.cxx
+++ b/simgear/scene/model/SGPagedLOD.cxx
@@ -56,7 +56,7 @@ bool SGPagedLOD::addChild(osg::Node *child)
     {
         osg::ref_ptr<SGModelData> d = opts->getModelData();
         if(d.valid())
-            d->modelLoaded(getFileName(getNumChildren()-1), 0,
+            d->modelLoaded(getFileName(getNumChildren()-1), opts->getPropRoot(),
                            this);
     }
     return true;

diff --git a/simgear/scene/model/modellib.cxx b/simgear/scene/model/modellib.cxx
index 9564435156bb44d66b72a83ab8ff44cf071388b3..3fbced89ba4e846478654b22c727bbb9817b17e0 100644 (file)
--- a/simgear/scene/model/modellib.cxx
+++ b/simgear/scene/model/modellib.cxx
@@ -67,7 +67,7 @@ SGModelLib::loadModel(const string &path,
     opt->setModelData(data);
     osg::Node *n = readNodeFile(path, opt.get());
     if(data)
-        data->modelLoaded(path, 0, n);
+        data->modelLoaded(path, prop_root, n);
     if (n && n->getName().empty())
         n->setName("Direct loaded model \"" + path + "\"");
     return n;