Merge pull request mrdoob#13030 from dhritzkiv/patch-25

PMREM: Restore previous renderTarget after update()
FloraCat526 · Jan 10, 2018 · 38162cc · 38162cc
2 parents 50fcfd0 + c7c5645
commit 38162cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/examples/js/pmrem/PMREMCubeUVPacker.js b/examples/js/pmrem/PMREMCubeUVPacker.js
@@ -114,12 +114,15 @@ THREE.PMREMCubeUVPacker.prototype = {
 		var gammaOutput = renderer.gammaOutput;
 		var toneMapping = renderer.toneMapping;
 		var toneMappingExposure = renderer.toneMappingExposure;
+		var currentRenderTarget = renderer.getRenderTarget();
+
 		renderer.gammaInput = false;
 		renderer.gammaOutput = false;
 		renderer.toneMapping = THREE.LinearToneMapping;
 		renderer.toneMappingExposure = 1.0;
 		renderer.render( this.scene, this.camera, this.CubeUVRenderTarget, false );
 
+		renderer.setRenderTarget( currentRenderTarget );
 		renderer.toneMapping = toneMapping;
 		renderer.toneMappingExposure = toneMappingExposure;
 		renderer.gammaInput = gammaInput;

diff --git a/examples/js/pmrem/PMREMGenerator.js b/examples/js/pmrem/PMREMGenerator.js
@@ -90,6 +90,7 @@ THREE.PMREMGenerator.prototype = {
 		var gammaOutput = renderer.gammaOutput;
 		var toneMapping = renderer.toneMapping;
 		var toneMappingExposure = renderer.toneMappingExposure;
+		var currentRenderTarget = renderer.getRenderTarget();
 
 		renderer.toneMapping = THREE.LinearToneMapping;
 		renderer.toneMappingExposure = 1.0;
@@ -109,6 +110,7 @@ THREE.PMREMGenerator.prototype = {
 
 		}
 
+		renderer.setRenderTarget( currentRenderTarget );
 		renderer.toneMapping = toneMapping;
 		renderer.toneMappingExposure = toneMappingExposure;
 		renderer.gammaInput = gammaInput;