Browse Source

Clarified code.

tschw 10 years ago
parent
commit
43d6e87e58
1 changed files with 7 additions and 4 deletions
  1. 7 4
      src/renderers/WebGLRenderer.js

+ 7 - 4
src/renderers/WebGLRenderer.js

@@ -2092,11 +2092,14 @@ THREE.WebGLRenderer = function ( parameters ) {
 			// changed glsl or parameters
 			deallocateMaterial( material );
 
-		} else if ( shaderID ||
-				material.__webglShader.uniforms === material.uniforms ) {
+		} else if ( shaderID === undefined ) {
 
-			// stop unless the container object for the uniforms has
-			// changed - same glsl and parameters
+			// same glsl
+			return;
+
+		} else if ( material.__webglShader.uniforms === material.uniforms ) {
+
+			// same uniforms (container object)
 			return;
 
 		}