From c92e7bed87076288e5cba05a804c449fad258dba Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Tue, 26 May 2015 09:23:27 -0700
Subject: [PATCH] andrews CR feedback

---
 interface/src/ui/overlays/ModelOverlay.cpp | 2 --
 libraries/entities/src/EntityItem.cpp      | 3 +++
 libraries/entities/src/EntityTree.cpp      | 6 +-----
 tests/octree/src/ModelTests.cpp            | 2 --
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 29d7c20f09..749dba9ea8 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -11,8 +11,6 @@
 
 #include <GlowEffect.h>
 
-#include "../../Menu.h"
-
 #include "ModelOverlay.h"
 
 ModelOverlay::ModelOverlay()
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index e8210c7e79..7d2df73bfb 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -87,6 +87,9 @@ EntityItem::~EntityItem() {
     assert(!_simulated);
     assert(!_element);
     assert(!_physicsInfo);
+    
+    qDebug() << "EntityItem::~EntityItem()";
+    debugDump();
 }
 
 EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& params) const {
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index fc7a05b5a8..0cee73c584 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -375,9 +375,6 @@ void EntityTree::processRemovedEntities(const DeleteEntityOperator& theOperator)
         if (_simulation) {
             _simulation->removeEntity(theEntity);
         }
-        
-        // FIX ME!!!
-        //delete theEntity; // we can delete the entity immediately
     }
     if (_simulation) {
         _simulation->unlock();
@@ -675,11 +672,11 @@ void EntityTree::update() {
             // translate into list of ID's
             QSet<EntityItemID> idsToDelete;
             
-            // NOTE: TEST ME!!
             for (auto entity : pendingDeletes) {
                 assert(!entity->getPhysicsInfo()); // TODO: Andrew to remove this after testing
                 idsToDelete.insert(entity->getEntityItemID());
             }
+            
             // delete these things the roundabout way
             deleteEntities(idsToDelete, true);
         }
@@ -1007,7 +1004,6 @@ bool EntityTree::sendEntitiesOperation(OctreeElement* element, void* extraData)
     SendEntitiesOperationArgs* args = static_cast<SendEntitiesOperationArgs*>(extraData);
     EntityTreeElement* entityTreeElement = static_cast<EntityTreeElement*>(element);
 
-    //const QList<EntityItemPointer>&  entities = entityTreeElement->getEntities();
     const EntityItems&  entities = entityTreeElement->getEntities();
     for (int i = 0; i < entities.size(); i++) {
         EntityItemID newID(QUuid::createUuid());
diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp
index 548428960c..4fe43d10bd 100644
--- a/tests/octree/src/ModelTests.cpp
+++ b/tests/octree/src/ModelTests.cpp
@@ -390,7 +390,6 @@ void EntityTests::entityTreeTests(bool verbose) {
             } else {
                 if (extraVerbose) {
                     qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName) << "iteration:" << i
-                          //<< "foundEntityByID=" << foundEntityByID
                           << "containingElement=" << containingElement;
                 }
             }
@@ -470,7 +469,6 @@ void EntityTests::entityTreeTests(bool verbose) {
                 } else {
                     if (extraVerbose) {
                         qDebug() << "FAILED - Test" << testsTaken <<":" << qPrintable(testName) << "iteration:" << i
-                              //<< "foundEntityByID=" << foundEntityByID
                               << "containingElement=" << containingElement;
                     }
                 }