From eeb13d1efc8672890d670c83d74f31ae9746cf1d Mon Sep 17 00:00:00 2001
From: Laurens Voerman <l.voerman@rug.nl>
Date: Mon, 14 Jan 2019 10:19:41 +0100
Subject: [PATCH] clear temp objectCache in databaseRequest

---
 src/osgDB/DatabasePager.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp
index 0ce93db42..dc1ebbb87 100644
--- a/src/osgDB/DatabasePager.cpp
+++ b/src/osgDB/DatabasePager.cpp
@@ -1663,12 +1663,6 @@ void DatabasePager::addLoadedDataToSceneGraph(const osg::FrameStamp &frameStamp)
                 registerPagedLODs(databaseRequest->_loadedModel.get(), frameNumber);
             }
 
-            if (databaseRequest->_objectCache.valid() && osgDB::Registry::instance()->getObjectCache())
-            {
-                // insert loaded model into Registry ObjectCache
-                osgDB::Registry::instance()->getObjectCache()->addObjectCache( databaseRequest->_objectCache.get());
-            }
-
             // OSG_NOTICE<<"merged subgraph"<<databaseRequest->_fileName<<" after "<<databaseRequest->_numOfRequests<<" requests and time="<<(timeStamp-databaseRequest->_timestampFirstRequest)*1000.0<<std::endl;
 
             double timeToMerge = timeStamp-databaseRequest->_timestampFirstRequest;
@@ -1684,6 +1678,13 @@ void DatabasePager::addLoadedDataToSceneGraph(const osg::FrameStamp &frameStamp)
             OSG_INFO<<"DatabasePager::addLoadedDataToSceneGraph() node in parental chain deleted, discarding subgaph."<<std::endl;
         }
 
+
+        if (databaseRequest->_objectCache.valid() && osgDB::Registry::instance()->getObjectCache())
+        {
+            // insert loaded model into Registry ObjectCache
+            osgDB::Registry::instance()->getObjectCache()->addObjectCache( databaseRequest->_objectCache.get());
+            databaseRequest->_objectCache->clear();
+        }
         // reset the loadedModel pointer
         databaseRequest->_loadedModel = 0;