From f5aaad1f33626a0204170c68675cdebe1b2662bf Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 4 Mar 2014 10:05:43 -0800
Subject: [PATCH] remove if checks in cases where delete handles null

---
 interface/src/renderer/TextureCache.cpp | 11 ++++-------
 libraries/shared/src/Node.cpp           |  5 +----
 svo-viewer/src/Render2.cpp              |  5 ++++-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/interface/src/renderer/TextureCache.cpp b/interface/src/renderer/TextureCache.cpp
index dcaf059714..d5d3b42155 100644
--- a/interface/src/renderer/TextureCache.cpp
+++ b/interface/src/renderer/TextureCache.cpp
@@ -41,15 +41,12 @@ TextureCache::~TextureCache() {
         glDeleteTextures(1, &id);
     }
     if (_primaryFramebufferObject) {
-        delete _primaryFramebufferObject;
         glDeleteTextures(1, &_primaryDepthTextureID);
     }
-    if (_secondaryFramebufferObject) {
-        delete _secondaryFramebufferObject;
-    }
-    if (_tertiaryFramebufferObject) {
-        delete _tertiaryFramebufferObject;
-    }
+    
+    delete _primaryFramebufferObject;
+    delete _secondaryFramebufferObject;
+    delete _tertiaryFramebufferObject;
 }
 
 GLuint TextureCache::getPermutationNormalTextureID() {
diff --git a/libraries/shared/src/Node.cpp b/libraries/shared/src/Node.cpp
index 889f3e2ed0..dadf39f790 100644
--- a/libraries/shared/src/Node.cpp
+++ b/libraries/shared/src/Node.cpp
@@ -62,10 +62,7 @@ Node::Node(const QUuid& uuid, char type, const HifiSockAddr& publicSocket, const
 }
 
 Node::~Node() {
-    if (_linkedData) {
-        delete _linkedData;
-    }
-
+    delete _linkedData;
     delete _bytesReceivedMovingAverage;
 }
 
diff --git a/svo-viewer/src/Render2.cpp b/svo-viewer/src/Render2.cpp
index 06410cfe4e..56ce3e04ae 100755
--- a/svo-viewer/src/Render2.cpp
+++ b/svo-viewer/src/Render2.cpp
@@ -267,7 +267,10 @@ void SvoViewer::InitializeVoxelOpt2RenderSystem()
 		delete [] _readVertexStructs;
 		//delete [] _readIndicesArray;
 		delete [] faceCenters;
-		for (int k = 0; k < NUM_CUBE_FACES; k++) if (_segmentIdxBuffers[i].idxBuff[k]) delete [] _segmentIdxBuffers[i].idxBuff[k];
+		
+        for (int k = 0; k < NUM_CUBE_FACES; k++) {
+            delete[] _segmentIdxBuffers[i].idxBuff[k];
+        }
 	}
 
 	_voxelOptRenderInitialized = true;