From fe9c2358066fad0ce0f84bdb5ce9f73c5e5716f7 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 1 Jul 2019 12:56:36 +0100
Subject: [PATCH] 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.

---
 src/osgPlugins/fbx/ReaderWriterFBX.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/osgPlugins/fbx/ReaderWriterFBX.cpp b/src/osgPlugins/fbx/ReaderWriterFBX.cpp
index ea8fefce9..f5cd257ea 100644
--- a/src/osgPlugins/fbx/ReaderWriterFBX.cpp
+++ b/src/osgPlugins/fbx/ReaderWriterFBX.cpp
@@ -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);