Also use blank texture if given texture is not renderable

pissang · Mar 12, 2018 · b251a7f · b251a7f
1 parent 3788617
commit b251a7f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Renderer.js b/src/Renderer.js
@@ -837,17 +837,21 @@ var Renderer = Base.extend(function () {
             var uniformValue = getUniformValue(renderable, material, symbol);
             var uniformType = uniform.type;
 
-            if (uniformValue == null && uniformType === 't') {
-                uniformValue = placeholderTexture;
+            if (uniformType === 't') {
+                if (!uniformValue || !uniformValue.isRenderable()) {
+                    uniformValue = placeholderTexture;
+                }
             }
             // PENDING
             // When binding two materials with the same shader
             // Many uniforms will be be set twice even if they have the same value
             // So add a evaluation to see if the uniform is really needed to be set
             if (prevMaterial && sameProgram) {
                 var prevUniformValue = getUniformValue(prevRenderable, prevMaterial, symbol);
-                if (prevUniformValue == null && uniformType === 't') {
-                    prevUniformValue = placeholderTexture;
+                if (uniformType === 't') {
+                    if (!prevUniformValue || !prevUniformValue.isRenderable()) {
+                        prevUniformValue = placeholderTexture;
+                    }
                 }
 
                 if (prevUniformValue === uniformValue) {