From 95570d5abc7c8ce150842f959412cad211713a13 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sun, 10 May 2020 18:39:13 +0200 Subject: [PATCH] Kill the entity in processRemovedEntities before calling prepareEntityForDelete This was removed back in 9d92546a and causes an assertion (#337) --- libraries/entities/src/EntityTree.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 11cd6309da..1c1b3a41f5 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -784,6 +784,7 @@ void EntityTree::processRemovedEntities(const DeleteEntityOperator& theOperator) } } if (theEntity->isSimulated()) { + theEntity->die(); _simulation->prepareEntityForDelete(theEntity); } }