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

Restructed the setting of the default osgDB::Options so it doesn't override the ObjectCacheHint setting when a user specified osgDB::Options object is passed in.

Browse Source
This commit is contained in:
Robert Osfield 2019-07-01 12:56:36 +01:00
parent 8d505e80a9
commit fe9c235806
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/fbx/ReaderWriterFBX.cpp
View File

@ -305,10 +305,14 @@ ReaderWriterFBX::readNode(const std::string& filenameInit,
int nLightCount = 0;
osg::ref_ptr<Options> localOptions = NULL;
if (options)
{
localOptions = options->cloneOptions();
}
else
{
localOptions = new osgDB::Options();
localOptions->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_IMAGES);
localOptions->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_IMAGES);
}
std::string filePath = osgDB::getFilePath(filename);
FbxMaterialToOsgStateSet fbxMaterialToOsgStateSet(filePath, localOptions.get(), lightmapTextures);