From 4dad797e2044304208fff625179118ab04621b7e Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Thu, 10 Mar 2016 22:52:44 -0800
Subject: [PATCH] Only add buffer/tex to skymap if asked for

---
 libraries/model/src/model/Skybox.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/libraries/model/src/model/Skybox.cpp b/libraries/model/src/model/Skybox.cpp
index aff4361338..cb3fb43630 100755
--- a/libraries/model/src/model/Skybox.cpp
+++ b/libraries/model/src/model/Skybox.cpp
@@ -50,12 +50,16 @@ void Skybox::updateSchemaBuffer() const {
 }
 
 void Skybox::prepare(gpu::Batch& batch, int textureSlot, int bufferSlot) const {
-    batch.setUniformBuffer(bufferSlot, _schemaBuffer);
+    if (bufferSlot > -1) {
+        batch.setUniformBuffer(bufferSlot, _schemaBuffer);
+    }
 
-    gpu::TexturePointer skymap = getCubemap();
-    // FIXME: skymap->isDefined may not be threadsafe
-    if (skymap && skymap->isDefined()) {
-        batch.setResourceTexture(textureSlot, skymap);
+    if (textureSlot > -1) {
+        gpu::TexturePointer skymap = getCubemap();
+        // FIXME: skymap->isDefined may not be threadsafe
+        if (skymap && skymap->isDefined()) {
+            batch.setResourceTexture(textureSlot, skymap);
+        }
     }
 }