From 9cae11cc3c958e3beced774c7403027c07e88d12 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 4 Jun 2015 09:55:25 -0700 Subject: [PATCH] clean up actions when DeleteEntityOperator's list is processed rather than as it's made --- libraries/entities/src/DeleteEntityOperator.cpp | 7 ------- libraries/entities/src/EntityTree.cpp | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/entities/src/DeleteEntityOperator.cpp b/libraries/entities/src/DeleteEntityOperator.cpp index 55db39c1bc..051accc732 100644 --- a/libraries/entities/src/DeleteEntityOperator.cpp +++ b/libraries/entities/src/DeleteEntityOperator.cpp @@ -46,13 +46,6 @@ void DeleteEntityOperator::addEntityIDToDeleteList(const EntityItemID& searchEnt //assert(false); qCDebug(entities) << "that's UNEXPECTED, we got a _containingElement, but couldn't find the oldEntity!"; } else { - const EntityTree* tree = details.containingElement->getTree(); - if (tree) { - EntitySimulation* simulation = tree->getSimulation(); - if (simulation) { - details.entity->clearActions(simulation); - } - } details.cube = details.containingElement->getAACube(); _entitiesToDelete << details; _lookingCount++; diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index f50dd59234..a827d01386 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -381,6 +381,7 @@ void EntityTree::processRemovedEntities(const DeleteEntityOperator& theOperator) } if (_simulation) { + theEntity->clearActions(_simulation); _simulation->removeEntity(theEntity); } }