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

scenery: Do not use a seperate set of options for loading the model.

Browse Source 
This fixes a problem introduced in commit
4e24095d8b.
Also this should fix Bug #698.
This commit is contained in:
Mathias Froehlich 2012-03-04 17:09:24 +01:00
parent 0d9b247da1
commit f5067b058c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,11 +269,9 @@ sgLoad3DModel_internal(const SGPath& path,
if (!texturepath.extension().empty())
texturepath = texturepath.dir();
osg::ref_ptr<SGReaderWriterOptions> options2;
options2 = new SGReaderWriterOptions(*options);
options2->setDatabasePath(texturepath.str());
options->setDatabasePath(texturepath.str());
osgDB::ReaderWriter::ReadResult modelResult;
modelResult = osgDB::readNodeFile(modelpath.str(), options2.get());
modelResult = osgDB::readNodeFile(modelpath.str(), options.get());
if (!modelResult.validNode())
throw sg_io_exception("Failed to load 3D model:" + modelResult.message(),
modelpath.str());
@ -289,7 +287,7 @@ sgLoad3DModel_internal(const SGPath& path,
model->addObserver(databaseReference);
// Update liveries
TextureUpdateVisitor liveryUpdate(options2->getDatabasePathList());
TextureUpdateVisitor liveryUpdate(options->getDatabasePathList());
model->accept(liveryUpdate);
// Copy the userdata fields, still sharing the boundingvolumes,