Browse Source

WebGLRenderer: properties.get() always return an object, so we can assign directly.
Not sure why this code needs to be executed every frame though. /ping @tschw @MiiBond

Mr.doob 10 years ago
parent
commit
e5420e609f
1 changed files with 9 additions and 10 deletions
  1. 9 10
      src/renderers/WebGLRenderer.js

+ 9 - 10
src/renderers/WebGLRenderer.js

@@ -1309,23 +1309,22 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 					var material = object.material;
 					var material = object.material;
 
 
-					if ( material !== null && material.visible === true ) {
+					if ( material.visible === true ) {
 
 
 						if ( material instanceof THREE.MeshFaceMaterial ) {
 						if ( material instanceof THREE.MeshFaceMaterial ) {
-							for ( var i = 0, l = material.materials.length; i < l; i ++ ) {
-								if ( properties.get( material.materials[ i ] ) ) {
 
 
-									material.materials[ i ].program = properties.get( material.materials[ i ] ).program;
+							var materials = material.materials;
 
 
-								}
-							}
-						}
-						else {
-							if ( properties.get( material ) ) {
+							for ( var i = 0, l = materials.length; i < l; i ++ ) {
 
 
-								material.program = properties.get( material ).program;
+								materials[ i ].program = properties.get( materials[ i ] ).program;
 
 
 							}
 							}
+
+						} else {
+
+							material.program = properties.get( material ).program;
+
 						}
 						}
 
 
 						if ( material.transparent ) {
 						if ( material.transparent ) {