Browse Source

WebGLRenderer: Removed material reference that broke changing materials in editor.

Mr.doob 10 years ago
parent
commit
7ebe07731b
2 changed files with 3 additions and 4 deletions
  1. 3 3
      src/renderers/WebGLRenderer.js
  2. 0 1
      src/renderers/webgl/WebGLObjects.js

+ 3 - 3
src/renderers/WebGLRenderer.js

@@ -1584,9 +1584,9 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 			return a.object.renderOrder - b.object.renderOrder;
 			return a.object.renderOrder - b.object.renderOrder;
 
 
-		} else if ( a.material.id !== b.material.id ) {
+		} else if ( a.object.material.id !== b.object.material.id ) {
 
 
-			return a.material.id - b.material.id;
+			return a.object.material.id - b.object.material.id;
 
 
 		} else if ( a.z !== b.z ) {
 		} else if ( a.z !== b.z ) {
 
 
@@ -1863,7 +1863,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 			} else {
 			} else {
 
 
-				material = webglObject.material;
+				material = object.material;
 
 
 				if ( ! material ) continue;
 				if ( ! material ) continue;
 
 

+ 0 - 1
src/renderers/webgl/WebGLObjects.js

@@ -88,7 +88,6 @@ THREE.WebGLObjects = function ( gl, info ) {
 				objects[ object.id ] = {
 				objects[ object.id ] = {
 					id: object.id,
 					id: object.id,
 					object: object,
 					object: object,
-					material: object.material,
 					z: 0
 					z: 0
 				};
 				};