Merge pull request #11051 from takahirox/ArrayCameraRenderer

Not update renderer property for ArrayCamera render
mrdoob · Apr 4, 2017 · 61ec445 · 61ec445
2 parents 79eb8a1 + 30ca336
commit 61ec445
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js
@@ -1233,12 +1233,6 @@ function WebGLRenderer( parameters ) {
 		state.buffers.depth.setMask( true );
 		state.buffers.color.setMask( true );
 
-		if ( camera.isArrayCamera && camera.enabled ) {
-
-			_this.setScissorTest( false );
-
-		}
-
 		camera.onAfterRender( _this );
 
 		// _gl.finish();
@@ -1415,15 +1409,19 @@ function WebGLRenderer( parameters ) {
 
 					var camera2 = cameras[ j ];
 					var bounds = camera2.bounds;
-					_this.setViewport(
-						bounds.x * _width * _pixelRatio, bounds.y * _height * _pixelRatio,
-						bounds.z * _width * _pixelRatio, bounds.w * _height * _pixelRatio
+					state.viewport(
+						_currentViewport.set(
+							bounds.x * _width * _pixelRatio, bounds.y * _height * _pixelRatio,
+							bounds.z * _width * _pixelRatio, bounds.w * _height * _pixelRatio
+						)
 					);
-					_this.setScissor(
-						bounds.x * _width * _pixelRatio, bounds.y * _height * _pixelRatio,
-						bounds.z * _width * _pixelRatio, bounds.w * _height * _pixelRatio
+					state.scissor(
+						_currentScissor.set(
+							bounds.x * _width * _pixelRatio, bounds.y * _height * _pixelRatio,
+							bounds.z * _width * _pixelRatio, bounds.w * _height * _pixelRatio
+						)
 					);
-					_this.setScissorTest( true );
+					state.setScissorTest( true );
 					renderObject( object, scene, camera2, geometry, material, group );
 
 				}