From a11da43b0d274dabb42854b2d3373faeb445f21b Mon Sep 17 00:00:00 2001
From: milad <milad@miladnazeri.com>
Date: Tue, 10 Sep 2019 15:40:56 -0700
Subject: [PATCH] added additional branch in clearDomainAndNonOwnedEntities to
 handle localEntities parented

---
 libraries/entities-renderer/src/EntityTreeRenderer.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index fd82567a94..95f1f32dfc 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -229,7 +229,11 @@ void EntityTreeRenderer::clearDomainAndNonOwnedEntities() {
         for (const auto& entry :  _entitiesInScene) {
             const auto& renderer = entry.second;
             const EntityItemPointer& entityItem = renderer->getEntity();
-            if (!(entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == sessionUUID))) {
+            auto parentID = entityItem->getParentID();
+            auto parent = getTree()->findEntityByEntityItemID(parentID);
+            if ((!entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == sessionUUID))) {
+                fadeOutRenderable(renderer);
+            } else if (entityItem->isLocalEntity() && parent && parent->getNestableType() == NestableType::Entity) {
                 fadeOutRenderable(renderer);
             } else {
                 savedEntities[entry.first] = entry.second;