From 081e62a64758ff2187edad65c73ff32d9d695676 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Fri, 22 Feb 2019 14:26:15 -0800
Subject: [PATCH] fix parent loop crash

---
 libraries/shared/src/SpatiallyNestable.cpp | 9 +++++++--
 libraries/shared/src/SpatiallyNestable.h   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp
index 19fafdccf4..8d2e5ea45b 100644
--- a/libraries/shared/src/SpatiallyNestable.cpp
+++ b/libraries/shared/src/SpatiallyNestable.cpp
@@ -1420,11 +1420,16 @@ QUuid SpatiallyNestable::getEditSenderID() {
     return editSenderID;
 }
 
-void SpatiallyNestable::bumpAncestorChainRenderableVersion() const {
+void SpatiallyNestable::bumpAncestorChainRenderableVersion(int depth) const {
+    if (depth > MAX_PARENTING_CHAIN_SIZE) {
+        breakParentingLoop();
+        return;
+    }
+
     _ancestorChainRenderableVersion++;
     bool success = false;
     auto parent = getParentPointer(success);
     if (success && parent) {
-        parent->bumpAncestorChainRenderableVersion();
+        parent->bumpAncestorChainRenderableVersion(depth + 1);
     }
 }
\ No newline at end of file
diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h
index 495c941c07..a802a25e89 100644
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@@ -221,7 +221,7 @@ public:
     bool hasGrabs();
     virtual QUuid getEditSenderID();
 
-    void bumpAncestorChainRenderableVersion() const;
+    void bumpAncestorChainRenderableVersion(int depth = 0) const;
 
 protected:
     QUuid _id;