Browse Source

WebGLRenderer: Parameter overrideMaterial in renderObjects() and renderObjectsImmediate() should not be optional.

tsone 10 years ago
parent
commit
02ee46097a
1 changed files with 4 additions and 8 deletions
  1. 4 8
      src/renderers/WebGLRenderer.js

+ 4 - 8
src/renderers/WebGLRenderer.js

@@ -3384,13 +3384,13 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 			this.setBlending( THREE.NoBlending );
 
-			renderObjects( opaqueObjects, camera, lights, fog );
-			renderObjectsImmediate( _webglObjectsImmediate, 'opaque', camera, lights, fog );
+			renderObjects( opaqueObjects, camera, lights, fog, null );
+			renderObjectsImmediate( _webglObjectsImmediate, 'opaque', camera, lights, fog, null );
 
 			// transparent pass (back-to-front order)
 
-			renderObjects( transparentObjects, camera, lights, fog );
-			renderObjectsImmediate( _webglObjectsImmediate, 'transparent', camera, lights, fog );
+			renderObjects( transparentObjects, camera, lights, fog, null );
+			renderObjectsImmediate( _webglObjectsImmediate, 'transparent', camera, lights, fog, null );
 
 		}
 
@@ -3495,8 +3495,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 	function renderObjects( renderList, camera, lights, fog, overrideMaterial ) {
 
-		overrideMaterial = overrideMaterial || null;
-
 		var material;
 
 		for ( var i = 0, l = renderList.length; i < l; i ++ ) {
@@ -3540,8 +3538,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 	function renderObjectsImmediate ( renderList, materialType, camera, lights, fog, overrideMaterial ) {
 
-		overrideMaterial = overrideMaterial || null;
-
 		var material;
 
 		for ( var i = 0, l = renderList.length; i < l; i ++ ) {