From: Mathias Froehlich <Mathias.Froehlich@web.de>
Date: Wed, 28 Mar 2012 05:34:36 +0000 (+0200)
Subject: Revert "scenery: Use correct property root in xml loading."
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=df2e5bf39f605789dd62676d9584bc0933845854;p=simgear.git

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

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

This reverts commit 986d2cc42a94d558687be7c52027a9123551b676.
---

diff --git a/simgear/scene/model/SGReaderWriterXML.cxx b/simgear/scene/model/SGReaderWriterXML.cxx
index 6dbb42fc..17f23bc7 100644
--- a/simgear/scene/model/SGReaderWriterXML.cxx
+++ b/simgear/scene/model/SGReaderWriterXML.cxx
@@ -215,11 +215,8 @@ sgLoad3DModel_internal(const SGPath& path,
     SGPath texturepath(path);
     SGPath modelDir(modelpath.dir());
     
-    SGSharedPtr<SGPropertyNode> prop_root;
-    if (options->getPropertyNode().valid() &&
-        options->getPropertyNode()->getRootNode())
-        prop_root = options->getPropertyNode()->getRootNode();
-    else
+    SGSharedPtr<SGPropertyNode> prop_root = options->getPropertyNode();
+    if (!prop_root.valid())
         prop_root = new SGPropertyNode;
     osg::ref_ptr<SGModelData> data = options->getModelData();