FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "scenery: Use correct property root in xml loading."

Browse Source 
This helps for one symptom but it does not fix the
underlying problem. So ...

This reverts commit 986d2cc42a.
This commit is contained in:
Mathias Froehlich 2012-03-28 07:34:36 +02:00
parent ac29faf3bb
commit df2e5bf39f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
simgear/scene/model/SGReaderWriterXML.cxx
View File

@ -215,11 +215,8 @@ sgLoad3DModel_internal(const SGPath& path,
SGPath texturepath(path); SGPath texturepath(path);
SGPath modelDir(modelpath.dir()); SGPath modelDir(modelpath.dir());
SGSharedPtr<SGPropertyNode> prop_root; SGSharedPtr<SGPropertyNode> prop_root = options->getPropertyNode();
if (options->getPropertyNode().valid() && if (!prop_root.valid())
options->getPropertyNode()->getRootNode())
prop_root = options->getPropertyNode()->getRootNode();
else
prop_root = new SGPropertyNode; prop_root = new SGPropertyNode;
osg::ref_ptr<SGModelData> data = options->getModelData(); osg::ref_ptr<SGModelData> data = options->getModelData();