From aefa43bd116599a458b6cac467af42b9e7924cd7 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 24 Jun 2019 13:02:28 -0700
Subject: [PATCH] Prevent duplicates from accumulating in
 EntityTree::_needsParentFixup

---
 libraries/entities/src/EntityTree.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index dbc347631d..dca3ac595a 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -2121,9 +2121,10 @@ void EntityTree::fixupNeedsParentFixups() {
         _needsParentFixup.clear();
     }
 
+    std::unordered_set<QUuid> seenEntityIds;
     QMutableVectorIterator<EntityItemWeakPointer> iter(entitiesToFixup);
     while (iter.hasNext()) {
-        EntityItemWeakPointer entityWP = iter.next();
+        const auto& entityWP = iter.next();
         EntityItemPointer entity = entityWP.lock();
         if (!entity) {
             // entity was deleted before we found its parent
@@ -2131,6 +2132,17 @@ void EntityTree::fixupNeedsParentFixups() {
             continue;
         }
 
+        const auto id = entity->getID();
+        // BUGZ-771 some entities seem to never be removed by the below logic and further seem to accumulate dupes within the _needsParentFixup list
+        // This block ensures that duplicates are removed from entitiesToFixup before it's re-appended to _needsParentFixup
+        if (0 != seenEntityIds.count(id)) {
+            // Entity was duplicated inside entitiesToFixup
+            iter.remove();
+            continue;
+        }
+
+        seenEntityIds.insert(id);
+
         entity->requiresRecalcBoxes();
         bool queryAACubeSuccess { false };
         bool maxAACubeSuccess { false };