From b6322164cfbc7e3da3e20e80c7d3789985710785 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Mon, 14 Mar 2016 11:15:06 -0700
Subject: [PATCH] Guard against failure to load skybox tex

---
 .../entities-renderer/src/EntityTreeRenderer.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index cdd01d414e..ee2cc6df2d 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -364,15 +364,19 @@ void EntityTreeRenderer::applyZonePropertiesToScene(std::shared_ptr<ZoneEntityIt
                     _pendingSkyboxTexture = false;
 
                     auto texture = _skyboxTexture->getGPUTexture();
-                    skybox->setCubemap(texture);
-                    if (!isAmbientTextureSet) {
-                        sceneKeyLight->setAmbientSphere(texture->getIrradiance());
-                        sceneKeyLight->setAmbientMap(texture);
-                        isAmbientTextureSet = true;
+                    if (texture) {
+                        skybox->setCubemap(texture);
+                        if (!isAmbientTextureSet) {
+                            sceneKeyLight->setAmbientSphere(texture->getIrradiance());
+                            sceneKeyLight->setAmbientMap(texture);
+                            isAmbientTextureSet = true;
+                        }
+                    } else {
+                        qCDebug(entitiesrenderer) << "Failed to load skybox texture:" << zone->getSkyboxProperties().getURL();
+                        skybox->setCubemap(nullptr);
                     }
                 } else {
                     skybox->setCubemap(nullptr);
-                    qCDebug(entitiesrenderer) << "Failed to load skybox:" << zone->getSkyboxProperties().getURL();
                 }
             }