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

scenery: Use correct property root in xml loading.

Browse Source 
Really query for the root node when loading xml files.
This should fix
 http://code.google.com/p/flightgear-bugs/issues/detail?id=714
This commit is contained in:
Mathias Froehlich 2012-03-22 08:38:16 +01:00
parent 0b8bfd9ed8
commit 986d2cc42a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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