Remove unneeded explicit scenegraph deletion.

Modified Files:
	simgear/scene/tgdb/TileCache.cxx
 	simgear/scene/tgdb/TileEntry.cxx
	simgear/scene/tgdb/TileEntry.hxx

diff --git a/simgear/scene/tgdb/TileCache.cxx b/simgear/scene/tgdb/TileCache.cxx
index 106dd054bf7ea36126c2fcf12d5153789c6ed17e..1d34fd8df06ff04ebfa457ff1a02b42dca2aff80 100644 (file)
--- a/simgear/scene/tgdb/TileCache.cxx
+++ b/simgear/scene/tgdb/TileCache.cxx
@@ -52,7 +52,6 @@ void TileCache::entry_free( long cache_index ) {
     TileEntry *tile = tile_cache[cache_index];
     tile->removeFromSceneGraph();
 
-    tile->free_tile();
     delete tile;
 
     tile_cache.erase( cache_index );

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index 76cfd0c3d0d331706ad90975ebcefa377ca4cbec..d49925c25e0097e239ef6c346e3db87bbc2f8243 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -145,19 +145,6 @@ static void WorldCoordinate(osg::Matrix& obj_pos, double lat,
 }
 
 
-// Clean up the memory used by this tile and delete the arrays used by
-// ssg as well as the whole ssg branch
-bool TileEntry::free_tile() {
-    SG_LOG( SG_TERRAIN, SG_DEBUG,
-            "FREEING TILE = (" << tile_bucket << ")" );
-
-    _node->removeChildren(0, _node->getNumChildren());
-    _node = 0;
-
-    return true;
-}
-
-
 // Update the ssg transform node for this tile so it can be
 // properly drawn relative to our (0,0,0) point
 void TileEntry::prep_ssg_node(float vis) {

diff --git a/simgear/scene/tgdb/TileEntry.hxx b/simgear/scene/tgdb/TileEntry.hxx
index 287a95139dc423d797bc904bbcb8d989cf985d82..5fc6982765a57397bb7343b7683d7209c2c95ba0 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.hxx
+++ b/simgear/scene/tgdb/TileEntry.hxx
@@ -102,14 +102,6 @@ public:
 
     static void setModelLoadHelper(ModelLoadHelper *m) { _modelLoader=m; }
 
-    // Clean up the memory used by this tile and delete the arrays
-    // used by ssg as well as the whole ssg branch.  This does a
-    // partial clean up and exits so we can spread the load across
-    // multiple frames.  Returns false if work remaining to be done,
-    // true if dynamically allocated memory used by this tile is
-    // completely freed.
-    bool free_tile();
-
     // Update the ssg transform node for this tile so it can be
     // properly drawn relative to our (0,0,0) point
     void prep_ssg_node(float vis);