From: ThorstenB <brehmt@gmail.com>
Date: Fri, 15 Apr 2011 19:34:44 +0000 (+0200)
Subject: Clear OSG object cache on scenery reload
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb52b013f0e5e3371a1a82e0cbb51d3bbfd18e6d;p=flightgear.git

Clear OSG object cache on scenery reload
Scenery reload (menu: Debug-> Reload Scenery) also needs to clear the OSG
object cache, otherwise scenery isn't really reloaded from disk.
---

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 6c19ec5c0..7b59d60b0 100644
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -88,6 +88,8 @@ FGTileMgr::~FGTileMgr() {
     group->removeChildren(0, group->getNumChildren());
     delete _propListener;
     _propListener = NULL;
+    // clear OSG cache
+    osgDB::Registry::instance()->clearObjectCache();
 }
 
 
@@ -122,6 +124,12 @@ void FGTileMgr::reinit()
     group->removeChildren(0, group->getNumChildren());
     tile_cache.init();
     
+    // clear OSG cache, except on initial start-up
+    if (state != Start)
+    {
+        osgDB::Registry::instance()->clearObjectCache();
+    }
+    
     state = Inited;
     
     previous_bucket.make_bad();