From 66b05905097f1dca7d15f30d20187094c783428b Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 4 Mar 2014 10:48:53 -0800
Subject: [PATCH] Review fixes

---
 interface/src/ClipboardScriptingInterface.cpp | 2 --
 interface/src/ui/LocalVoxelsOverlay.cpp       | 1 -
 interface/src/ui/Overlay.cpp                  | 1 -
 interface/src/ui/Overlay.h                    | 3 ---
 interface/src/ui/Overlays.cpp                 | 7 +------
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/interface/src/ClipboardScriptingInterface.cpp b/interface/src/ClipboardScriptingInterface.cpp
index c99c55db4d..d9a8f04d90 100644
--- a/interface/src/ClipboardScriptingInterface.cpp
+++ b/interface/src/ClipboardScriptingInterface.cpp
@@ -5,8 +5,6 @@
 //  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
 //
 
-#include <LocalVoxelsList.h>
-
 #include "Application.h"
 #include "ClipboardScriptingInterface.h"
 
diff --git a/interface/src/ui/LocalVoxelsOverlay.cpp b/interface/src/ui/LocalVoxelsOverlay.cpp
index b14db72d99..01a885dedc 100644
--- a/interface/src/ui/LocalVoxelsOverlay.cpp
+++ b/interface/src/ui/LocalVoxelsOverlay.cpp
@@ -23,7 +23,6 @@ LocalVoxelsOverlay::LocalVoxelsOverlay() :
     Volume3DOverlay(),
     _voxelCount(0)
 {
-    _wantDeleteOnRenderThread = true;
 }
 
 LocalVoxelsOverlay::~LocalVoxelsOverlay() {
diff --git a/interface/src/ui/Overlay.cpp b/interface/src/ui/Overlay.cpp
index 61c0ee36c0..40da2253f4 100644
--- a/interface/src/ui/Overlay.cpp
+++ b/interface/src/ui/Overlay.cpp
@@ -18,7 +18,6 @@
 
 Overlay::Overlay() :
     _parent(NULL),
-    _wantDeleteOnRenderThread(false),
     _alpha(DEFAULT_ALPHA),
     _color(DEFAULT_BACKGROUND_COLOR),
     _visible(true)
diff --git a/interface/src/ui/Overlay.h b/interface/src/ui/Overlay.h
index 95d4bf7541..ad1084e889 100644
--- a/interface/src/ui/Overlay.h
+++ b/interface/src/ui/Overlay.h
@@ -32,7 +32,6 @@ public:
     virtual void render() = 0;
 
     // getters
-    bool deleteOnRenderThread() { return _wantDeleteOnRenderThread; }
     bool getVisible() const { return _visible; }
     const xColor& getColor() const { return _color; }
     float getAlpha() const { return _alpha; }
@@ -46,8 +45,6 @@ public:
 
 protected:
     QGLWidget* _parent;
-    bool _wantDeleteOnRenderThread;
-    
     float _alpha;
     xColor _color;
     bool _visible; // should the overlay be drawn at all
diff --git a/interface/src/ui/Overlays.cpp b/interface/src/ui/Overlays.cpp
index 684ba88e35..0c9415fa73 100644
--- a/interface/src/ui/Overlays.cpp
+++ b/interface/src/ui/Overlays.cpp
@@ -141,12 +141,7 @@ void Overlays::deleteOverlay(unsigned int id) {
         return;
     }
     
-    if (overlayToDelete->deleteOnRenderThread()) {
-        _overlaysToDelete.push_back(overlayToDelete);
-    } else {
-        delete overlayToDelete;
-    }
-    
+    _overlaysToDelete.push_back(overlayToDelete);
 }
 
 unsigned int Overlays::getOverlayAtPoint(const glm::vec2& point) {