From 81f63440236169d882002fcc74c10023cec56e16 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 17 Feb 2017 09:36:00 -0800 Subject: [PATCH] allow overlays to be parents --- interface/src/InterfaceParentFinder.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/interface/src/InterfaceParentFinder.cpp b/interface/src/InterfaceParentFinder.cpp index 824e81b6d8..14088bc716 100644 --- a/interface/src/InterfaceParentFinder.cpp +++ b/interface/src/InterfaceParentFinder.cpp @@ -45,12 +45,20 @@ SpatiallyNestableWeakPointer InterfaceParentFinder::find(QUuid parentID, bool& s success = true; return parent; } - if (parentID == AVATAR_SELF_ID) { success = true; return avatarManager->getMyAvatar(); } + // search overlays + auto& overlays = qApp->getOverlays(); + auto overlay = overlays.getOverlay(parentID); + parent = std::dynamic_pointer_cast(overlay); // this will return nullptr for non-3d overlays + if (!parent.expired()) { + success = true; + return parent; + } + success = false; return parent; }