From 56096708d3534b0d6a513c023c5a65d558f16184 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Tue, 29 Jan 2019 15:26:49 -0800
Subject: [PATCH] one more try

---
 .../entities-renderer/src/RenderableShapeEntityItem.cpp     | 4 ++--
 libraries/render-utils/src/MeshPartPayload.cpp              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
index 192c6cfd49..3aae5cdb1e 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@@ -53,7 +53,7 @@ bool ShapeEntityRenderer::needsRenderUpdate() const {
         }
 
         auto mat = _materials.find("0");
-        if (mat != _materials.end() && mat->second.needsUpdate()) {
+        if (mat != _materials.end() && (mat->second.needsUpdate() || mat->second.areTexturesLoading())) {
             return true;
         }
 
@@ -188,7 +188,7 @@ bool ShapeEntityRenderer::useMaterialPipeline(const graphics::MultiMaterial& mat
 
 ShapeKey ShapeEntityRenderer::getShapeKey() {
     auto mat = _materials.find("0");
-    if (mat != _materials.end() && mat->second.needsUpdate()) {
+    if (mat != _materials.end() && (mat->second.needsUpdate() || mat->second.areTexturesLoading())) {
         RenderPipelines::updateMultiMaterial(mat->second);
     }
 
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index bb2e784807..6409cdd231 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -83,7 +83,7 @@ void MeshPartPayload::updateKey(const render::ItemKey& key) {
     ItemKey::Builder builder(key);
     builder.withTypeShape();
 
-    if (_drawMaterials.needsUpdate()) {
+    if (_drawMaterials.needsUpdate() || _drawMaterials.areTexturesLoading()) {
         RenderPipelines::updateMultiMaterial(_drawMaterials);
     }
 
@@ -329,7 +329,7 @@ void ModelMeshPartPayload::updateKey(const render::ItemKey& key) {
         builder.withDeformed();
     }
 
-    if (_drawMaterials.needsUpdate()) {
+    if (_drawMaterials.needsUpdate() || _drawMaterials.areTexturesLoading()) {
         RenderPipelines::updateMultiMaterial(_drawMaterials);
     }
 
@@ -347,7 +347,7 @@ void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, PrimitiveMode pr
         return;
     }
 
-    if (_drawMaterials.needsUpdate()) {
+    if (_drawMaterials.needsUpdate() || _drawMaterials.areTexturesLoading()) {
         RenderPipelines::updateMultiMaterial(_drawMaterials);
     }