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

Propagate the lanel loader through the options.

Browse Source 
Modified Files:
	simgear/scene/model/SGReaderWriterXML.cxx
This commit is contained in:
frohlich
2009-06-25 10:13:02 +02:00
committed by Tim Moore
parent 5850464ba7
commit c577b7e369
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGReaderWriterXML.cxx
+4 -1
View File
@@ -169,7 +169,9 @@ sgLoad3DModel_internal(const string &path,
} }
osg::ref_ptr<SGReaderWriterXMLOptions> options osg::ref_ptr<SGReaderWriterXMLOptions> options
= new SGReaderWriterXMLOptions(*osgDB::Registry::instance()->getOptions()); = new SGReaderWriterXMLOptions(*options_);
options->setPropRoot(prop_root);
options->setLoadPanel(load_panel);
// Assume that textures are in // Assume that textures are in
// the same location as the XML file. // the same location as the XML file.
@@ -230,6 +232,7 @@ sgLoad3DModel_internal(const string &path,
osg::ref_ptr<SGReaderWriterXMLOptions> options; osg::ref_ptr<SGReaderWriterXMLOptions> options;
options = new SGReaderWriterXMLOptions(*options_); options = new SGReaderWriterXMLOptions(*options_);
options->setPropRoot(prop_root); options->setPropRoot(prop_root);
options->setLoadPanel(load_panel);
try { try {
submodel = sgLoad3DModel_internal(submodelpath.str(), options.get(), submodel = sgLoad3DModel_internal(submodelpath.str(), options.get(),
sub_props->getNode("overlay")); sub_props->getNode("overlay"));