From 49623fefd8603807084bcb8238fec3168db61d06 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 20 Jun 2017 18:00:32 -0700
Subject: [PATCH] Fix Skyboxes sometimes not showing

---
 libraries/entities-renderer/src/EntityTreeRenderer.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 5b258db46b..ffaac3bf3e 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -246,8 +246,13 @@ bool EntityTreeRenderer::findBestZoneAndMaybeContainingEntities(QVector<EntityIt
 
                     // if this entity is a zone and visible, determine if it is the bestZone
                     if (isZone && entity->getVisible()) {
-                        auto zone = std::dynamic_pointer_cast<ZoneEntityItem>(entity);
-                        _layeredZones.insert(zone);
+                        auto renderID = std::dynamic_pointer_cast<RenderableZoneEntityItem>(entity)->getRenderItemID();
+                        bool isValidRenderID = (renderID != render::Item::INVALID_ITEM_ID);
+
+                        if (isValidRenderID) {
+                            auto zone = std::dynamic_pointer_cast<ZoneEntityItem>(entity);
+                            _layeredZones.insert(zone);
+                        }
                     }
                 }
             }
@@ -354,6 +359,7 @@ bool EntityTreeRenderer::applyLayeredZones() {
 
         for (auto& zone : _layeredZones) {
             auto id = std::dynamic_pointer_cast<RenderableZoneEntityItem>(zone.zone)->getRenderItemID();
+            Q_ASSERT(id != render::Item::INVALID_ITEM_ID);
             list.push_back(id);
         }
         render::Selection selection("RankedZones", list);