Updated builds.

build/three.js

@@ -20744,9 +20744,9 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 			return a.object.renderOrder - b.object.renderOrder;
 
-		} else if ( a.object.material.id !== b.object.material.id ) {
+		} else if ( a.material.id !== b.material.id ) {
 
-			return a.object.material.id - b.object.material.id;
+			return a.material.id - b.material.id;
 
 		} else if ( a.z !== b.z ) {
 
@@ -20945,6 +20945,13 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				if ( material.visible === true ) {
 
+					if ( _this.sortObjects === true ) {
+
+						_vector3.setFromMatrixPosition( object.matrixWorld );
+						_vector3.applyProjection( _projScreenMatrix );
+
+					}
+
 					if ( material instanceof THREE.MeshFaceMaterial ) {
 
 						var materials = material.materials;
@@ -20961,16 +20968,10 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 					}
 
-					if ( _this.sortObjects === true ) {
-
-						_vector3.setFromMatrixPosition( object.matrixWorld );
-						_vector3.applyProjection( _projScreenMatrix );
-
-					}
-
 					var renderItem = {
 						id: object.id,
 						object: object,
+						material: object.material,
 						z: _vector3.z
 					};
 

build/three.min.js

@@ -490,9 +490,9 @@ THREE.ShaderChunk.logdepthbuf_vertex,"}"].join("\n"),fragmentShader:["uniform sa
 THREE.ShaderChunk.logdepthbuf_fragment,"\t#ifdef USE_LOGDEPTHBUF_EXT\n\t\tgl_FragData[ 0 ] = pack_depth( gl_FragDepthEXT );\n\t#else\n\t\tgl_FragData[ 0 ] = pack_depth( gl_FragCoord.z );\n\t#endif\n}"].join("\n")}};
 THREE.WebGLRenderer=function(a){function b(a,b,c,d){!0===R&&(a*=d,b*=d,c*=d);t.clearColor(a,b,c,d)}function c(){L.init();t.viewport(Fa,Ga,Aa,va);b($.r,$.g,$.b,ea)}function d(){Xa=mb=null;Ha="";Ya=-1;fb=!0;L.reset()}function e(a){a.preventDefault();d();c();Z.clear()}function g(a){a=a.target;a.removeEventListener("dispose",g);a:{var b=Z.get(a);if(a.image&&b.__image__webglTextureCube)t.deleteTexture(b.__image__webglTextureCube);else{if(void 0===b.__webglInit)break a;t.deleteTexture(b.__webglTexture)}Z.delete(a)}Ba.textures--}
 function f(a){a=a.target;a.removeEventListener("dispose",f);var b=Z.get(a);if(a&&void 0!==b.__webglTexture){t.deleteTexture(b.__webglTexture);if(a instanceof THREE.WebGLRenderTargetCube)for(var c=0;6>c;c++)t.deleteFramebuffer(b.__webglFramebuffer[c]),t.deleteRenderbuffer(b.__webglRenderbuffer[c]);else t.deleteFramebuffer(b.__webglFramebuffer),t.deleteRenderbuffer(b.__webglRenderbuffer);Z.delete(a)}Ba.textures--}function h(a){a=a.target;a.removeEventListener("dispose",h);k(a);Z.delete(a)}function k(a){var b=
-Z.get(a).program.program;if(void 0!==b){a.program=void 0;a=0;for(var c=ta.length;a!==c;++a){var d=ta[a];if(d.program===b){0===--d.usedTimes&&(c-=1,ta[a]=ta[c],ta.pop(),t.deleteProgram(b),Ba.programs=c);break}}}}function m(a,b){return b[0]-a[0]}function n(a,b){return a.object.renderOrder!==b.object.renderOrder?a.object.renderOrder-b.object.renderOrder:a.object.material.id!==b.object.material.id?a.object.material.id-b.object.material.id:a.z!==b.z?a.z-b.z:a.id-b.id}function p(a,b){return a.object.renderOrder!==
-b.object.renderOrder?a.object.renderOrder-b.object.renderOrder:a.z!==b.z?b.z-a.z:a.id-b.id}function l(a){if(!1!==a.visible){if(a instanceof THREE.Light)aa.push(a);else if(a instanceof THREE.Sprite)Ra.push(a);else if(a instanceof THREE.LensFlare)Ia.push(a);else if(a instanceof THREE.ImmediateRenderObject){var b=a.material;b.transparent?za.push(a):la.push(a)}else if(a instanceof THREE.Mesh||a instanceof THREE.Line||a instanceof THREE.PointCloud)if(a instanceof THREE.SkinnedMesh&&a.skeleton.update(),
-!1===a.frustumCulled||!0===Za.intersectsObject(a))if(b=a.material,!0===b.visible){if(b instanceof THREE.MeshFaceMaterial)for(var c=b.materials,d=0,e=c.length;d<e;d++)c[d].program=Z.get(c[d]).program;else b.program=Z.get(b).program;!0===ja.sortObjects&&(ka.setFromMatrixPosition(a.matrixWorld),ka.applyProjection(Ja));d={id:a.id,object:a,z:ka.z};b.transparent?sa.push(d):oa.push(d)}a=a.children;d=0;for(e=a.length;d<e;d++)l(a[d])}}function q(a,b,c,d,e){for(var f=e,g=0,h=a.length;g<h;g++){var k=a[g].object,
+Z.get(a).program.program;if(void 0!==b){a.program=void 0;a=0;for(var c=ta.length;a!==c;++a){var d=ta[a];if(d.program===b){0===--d.usedTimes&&(c-=1,ta[a]=ta[c],ta.pop(),t.deleteProgram(b),Ba.programs=c);break}}}}function m(a,b){return b[0]-a[0]}function n(a,b){return a.object.renderOrder!==b.object.renderOrder?a.object.renderOrder-b.object.renderOrder:a.material.id!==b.material.id?a.material.id-b.material.id:a.z!==b.z?a.z-b.z:a.id-b.id}function p(a,b){return a.object.renderOrder!==b.object.renderOrder?
+a.object.renderOrder-b.object.renderOrder:a.z!==b.z?b.z-a.z:a.id-b.id}function l(a){if(!1!==a.visible){if(a instanceof THREE.Light)aa.push(a);else if(a instanceof THREE.Sprite)Ra.push(a);else if(a instanceof THREE.LensFlare)Ia.push(a);else if(a instanceof THREE.ImmediateRenderObject){var b=a.material;b.transparent?za.push(a):la.push(a)}else if(a instanceof THREE.Mesh||a instanceof THREE.Line||a instanceof THREE.PointCloud)if(a instanceof THREE.SkinnedMesh&&a.skeleton.update(),!1===a.frustumCulled||
+!0===Za.intersectsObject(a))if(b=a.material,!0===b.visible){!0===ja.sortObjects&&(ka.setFromMatrixPosition(a.matrixWorld),ka.applyProjection(Ja));if(b instanceof THREE.MeshFaceMaterial)for(var c=b.materials,d=0,e=c.length;d<e;d++)c[d].program=Z.get(c[d]).program;else b.program=Z.get(b).program;d={id:a.id,object:a,material:a.material,z:ka.z};b.transparent?sa.push(d):oa.push(d)}a=a.children;d=0;for(e=a.length;d<e;d++)l(a[d])}}function q(a,b,c,d,e){for(var f=e,g=0,h=a.length;g<h;g++){var k=a[g].object,
 l=wa.update(k);k.modelViewMatrix.multiplyMatrices(b.matrixWorldInverse,k.matrixWorld);k.normalMatrix.getNormalMatrix(k.modelViewMatrix);void 0===e&&(f=k.material);if(f instanceof THREE.MeshFaceMaterial)for(var m=l.groups,n=f.materials,p=0,q=m.length;p<q;p++){var s=m[p],t=n[s.materialIndex];void 0!==t&&ja.renderBufferDirect(b,c,d,l,t,k,s)}else ja.renderBufferDirect(b,c,d,l,f,k)}}function s(a,b,c,d,e){for(var f=e,g=0,h=a.length;g<h;g++){var k=a[g];k.modelViewMatrix.multiplyMatrices(b.matrixWorldInverse,
 k.matrixWorld);k.normalMatrix.getNormalMatrix(k.modelViewMatrix);void 0===e&&(f=k.material);r(f);var l=u(b,c,d,f,k);Ha="";k.render(function(a){ja.renderBufferImmediate(a,l,f)})}}function r(a){a.side!==THREE.DoubleSide?L.enable(t.CULL_FACE):L.disable(t.CULL_FACE);L.setFlipSided(a.side===THREE.BackSide);!0===a.transparent?L.setBlending(a.blending,a.blendEquation,a.blendSrc,a.blendDst,a.blendEquationAlpha,a.blendSrcAlpha,a.blendDstAlpha):L.setBlending(THREE.NoBlending);L.setDepthFunc(a.depthFunc);L.setDepthTest(a.depthTest);
 L.setDepthWrite(a.depthWrite);L.setColorWrite(a.colorWrite);L.setPolygonOffset(a.polygonOffset,a.polygonOffsetFactor,a.polygonOffsetUnits)}function u(a,b,c,d,e){var f,l,m,n;gb=0;var p=Z.get(d);if(d.needsUpdate||!p.program){a:{for(var q=Z.get(d),s=ac[d.type],r=0,u=0,y=0,z=0,B=0,E=b.length;B<E;B++){var D=b[B];D.onlyShadow||!1===D.visible||(D instanceof THREE.DirectionalLight&&r++,D instanceof THREE.PointLight&&u++,D instanceof THREE.SpotLight&&y++,D instanceof THREE.HemisphereLight&&z++)}f=r;l=u;m=