Browse Source

Merge pull request #18395 from Mugen87/dev11

WebGLRenderer: Refactor invocation of initMaterial().
Mr.doob 5 years ago
parent
commit
dd13ac2cd4
1 changed files with 7 additions and 9 deletions
  1. 7 9
      src/renderers/WebGLRenderer.js

+ 7 - 9
src/renderers/WebGLRenderer.js

@@ -1658,35 +1658,33 @@ function WebGLRenderer( parameters ) {
 
 
 			if ( materialProperties.program === undefined ) {
 			if ( materialProperties.program === undefined ) {
 
 
-				material.needsUpdate = true;
+				initMaterial( material, scene, object );
 
 
 			} else if ( material.fog && materialProperties.fog !== fog ) {
 			} else if ( material.fog && materialProperties.fog !== fog ) {
 
 
-				material.needsUpdate = true;
+				initMaterial( material, scene, object );
 
 
 			} else if ( materialProperties.environment !== environment ) {
 			} else if ( materialProperties.environment !== environment ) {
 
 
-				material.needsUpdate = true;
+				initMaterial( material, scene, object );
 
 
 			} else if ( materialProperties.needsLights && ( materialProperties.lightsStateVersion !== lights.state.version ) ) {
 			} else if ( materialProperties.needsLights && ( materialProperties.lightsStateVersion !== lights.state.version ) ) {
 
 
-				material.needsUpdate = true;
+				initMaterial( material, scene, object );
 
 
 			} else if ( materialProperties.numClippingPlanes !== undefined &&
 			} else if ( materialProperties.numClippingPlanes !== undefined &&
 				( materialProperties.numClippingPlanes !== _clipping.numPlanes ||
 				( materialProperties.numClippingPlanes !== _clipping.numPlanes ||
 				materialProperties.numIntersection !== _clipping.numIntersection ) ) {
 				materialProperties.numIntersection !== _clipping.numIntersection ) ) {
 
 
-				material.needsUpdate = true;
+				initMaterial( material, scene, object );
 
 
 			} else if ( materialProperties.outputEncoding !== _this.outputEncoding ) {
 			} else if ( materialProperties.outputEncoding !== _this.outputEncoding ) {
 
 
-				material.needsUpdate = true;
+				initMaterial( material, scene, object );
 
 
 			}
 			}
 
 
-		}
-
-		if ( material.version !== materialProperties.__version ) {
+		} else {
 
 
 			initMaterial( material, scene, object );
 			initMaterial( material, scene, object );
 			materialProperties.__version = material.version;
 			materialProperties.__version = material.version;