From 5c7e155a691a7f454112e390c158e178f7ae83e9 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 2 Jun 2016 14:18:12 +0100
Subject: [PATCH] Removed redudent code paths

---
 src/osg/Drawable.cpp      | 62 +++++++++++----------------------------
 src/osgFX/BumpMapping.cpp |  2 --
 2 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp
index 6fe470105..fb4d88a33 100644
--- a/src/osg/Drawable.cpp
+++ b/src/osg/Drawable.cpp
@@ -72,56 +72,28 @@ public:
         {
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex_deletedDisplayListCache);
 
-            bool trimFromFront = true;
-            if (trimFromFront)
+            unsigned int prev_size = _displayListMap.size();
+
+            // trim from front
+            DisplayListMap::iterator ditr=_displayListMap.begin();
+            unsigned int maxNumToDelete = (_displayListMap.size() > s_minimumNumberOfDisplayListsToRetainInCache) ? _displayListMap.size()-s_minimumNumberOfDisplayListsToRetainInCache : 0;
+            for(;
+                ditr!=_displayListMap.end() && elapsedTime<availableTime && noDeleted<maxNumToDelete;
+                ++ditr)
             {
-                unsigned int prev_size = _displayListMap.size();
+                glDeleteLists(ditr->second,1);
 
-                DisplayListMap::iterator ditr=_displayListMap.begin();
-                unsigned int maxNumToDelete = (_displayListMap.size() > s_minimumNumberOfDisplayListsToRetainInCache) ? _displayListMap.size()-s_minimumNumberOfDisplayListsToRetainInCache : 0;
-                for(;
-                    ditr!=_displayListMap.end() && elapsedTime<availableTime && noDeleted<maxNumToDelete;
-                    ++ditr)
-                {
-                    glDeleteLists(ditr->second,1);
+                elapsedTime = timer.delta_s(start_tick,timer.tick());
+                ++noDeleted;
 
-                    elapsedTime = timer.delta_s(start_tick,timer.tick());
-                    ++noDeleted;
-
-                    ++_numberDeletedDrawablesInLastFrame;
-                }
-
-                if (ditr!=_displayListMap.begin()) _displayListMap.erase(_displayListMap.begin(),ditr);
-
-                if (noDeleted+_displayListMap.size() != prev_size)
-                {
-                    OSG_WARN<<"Error in delete"<<std::endl;
-                }
+                ++_numberDeletedDrawablesInLastFrame;
             }
-            else
+
+            if (ditr!=_displayListMap.begin()) _displayListMap.erase(_displayListMap.begin(),ditr);
+
+            if (noDeleted+_displayListMap.size() != prev_size)
             {
-                unsigned int prev_size = _displayListMap.size();
-
-                DisplayListMap::reverse_iterator ditr=_displayListMap.rbegin();
-                unsigned int maxNumToDelete = (_displayListMap.size() > s_minimumNumberOfDisplayListsToRetainInCache) ? _displayListMap.size()-s_minimumNumberOfDisplayListsToRetainInCache : 0;
-                for(;
-                    ditr!=_displayListMap.rend() && elapsedTime<availableTime && noDeleted<maxNumToDelete;
-                    ++ditr)
-                {
-                    glDeleteLists(ditr->second,1);
-
-                    elapsedTime = timer.delta_s(start_tick,timer.tick());
-                    ++noDeleted;
-
-                    ++_numberDeletedDrawablesInLastFrame;
-                }
-
-                if (ditr!=_displayListMap.rbegin()) _displayListMap.erase(ditr.base(),_displayListMap.end());
-
-                if (noDeleted+_displayListMap.size() != prev_size)
-                {
-                    OSG_WARN<<"Error in delete"<<std::endl;
-                }
+                OSG_WARN<<"Error in delete"<<std::endl;
             }
         }
         elapsedTime = timer.delta_s(start_tick,timer.tick());
diff --git a/src/osgFX/BumpMapping.cpp b/src/osgFX/BumpMapping.cpp
index 3659d6ce5..87ab753dd 100644
--- a/src/osgFX/BumpMapping.cpp
+++ b/src/osgFX/BumpMapping.cpp
@@ -510,8 +510,6 @@ namespace
             }
 
             // second pass, self-shadowing
-            bool selfShadowing = false;
-            if (selfShadowing)
             {
                 std::ostringstream vp_oss;
                 vp_oss <<