From c577b7e3692421468451bb11ccee5e6d64a18aef Mon Sep 17 00:00:00 2001 From: frohlich Date: Tue, 23 Jun 2009 20:26:26 +0000 Subject: [PATCH] Propagate the lanel loader through the options. Modified Files: simgear/scene/model/SGReaderWriterXML.cxx --- simgear/scene/model/SGReaderWriterXML.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simgear/scene/model/SGReaderWriterXML.cxx b/simgear/scene/model/SGReaderWriterXML.cxx index 00c113be..e9020407 100644 --- a/simgear/scene/model/SGReaderWriterXML.cxx +++ b/simgear/scene/model/SGReaderWriterXML.cxx @@ -169,7 +169,9 @@ sgLoad3DModel_internal(const string &path, } osg::ref_ptr options - = new SGReaderWriterXMLOptions(*osgDB::Registry::instance()->getOptions()); + = new SGReaderWriterXMLOptions(*options_); + options->setPropRoot(prop_root); + options->setLoadPanel(load_panel); // Assume that textures are in // the same location as the XML file. @@ -230,6 +232,7 @@ sgLoad3DModel_internal(const string &path, osg::ref_ptr options; options = new SGReaderWriterXMLOptions(*options_); options->setPropRoot(prop_root); + options->setLoadPanel(load_panel); try { submodel = sgLoad3DModel_internal(submodelpath.str(), options.get(), sub_props->getNode("overlay")); -- 2.39.5