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 986d2cc42a
.
This commit is contained in:
parent
ac29faf3bb
commit
df2e5bf39f
@ -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();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user