Post-release fixes.

mrdoob · mrdoob · commit 2cc897199dfe · 2016-06-29T18:45:43.000-07:00
diff --git a/editor/js/libs/app.js b/editor/js/libs/app.js
@@ -11,7 +11,7 @@ var APP = {
 		var loader = new THREE.ObjectLoader();
 		var camera, scene, renderer;
 
-		var vr, controls, effect;
+		var controls, effect, cameraVR, isVR;
 
 		var events = {};
 
@@ -22,7 +22,7 @@ var APP = {
 
 		this.load = function ( json ) {
 
-			vr = json.project.vr;
+			isVR = json.project.vr;
 
 			renderer = new THREE.WebGLRenderer( { antialias: true } );
 			renderer.setClearColor( 0x000000 );
@@ -115,22 +115,13 @@ var APP = {
 			camera.aspect = this.width / this.height;
 			camera.updateProjectionMatrix();
 
-			if ( vr === true ) {
+			if ( isVR === true ) {
 
-				if ( camera.parent === null ) {
+				cameraVR = new THREE.PerspectiveCamera();
+				cameraVR.projectionMatrix = camera.projectionMatrix;
+				camera.add( cameraVR );
 
-					// camera needs to be in the scene so camera2 matrix updates
-
-					scene.add( camera );
-
-				}
-
-				var camera2 = camera.clone();
-				camera.add( camera2 );
-
-				camera = camera2;
-
-				controls = new THREE.VRControls( camera );
+				controls = new THREE.VRControls( cameraVR );
 				effect = new THREE.VREffect( renderer );
 
 				if ( WEBVR.isAvailable() === true ) {
@@ -195,10 +186,12 @@ var APP = {
 
 			}
 
-			if ( vr === true ) {
+			if ( isVR === true ) {
+
+				camera.updateMatrixWorld();
 
 				controls.update();
-				effect.render( scene, camera );
+				effect.render( scene, cameraVR );
 
 			} else {
 
diff --git a/examples/js/nodes/NodeMaterial.js b/examples/js/nodes/NodeMaterial.js
@@ -210,7 +210,7 @@ THREE.NodeMaterial.prototype.build = function() {
 	}
 
 	this.lights = this.requestAttrib.light;
-	this.transparent = this.requestAttrib.transparent;
+	this.transparent = this.requestAttrib.transparent || (this.blendMode !== THREE.NormalBlending && this.blendMode !== THREE.NoBlending);
 
 	this.vertexShader = [
 		this.prefixCode,

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ THREE.NodeMaterial.prototype.build = function() {`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`this.lights = this.requestAttrib.light;`
`213`		`- this.transparent = this.requestAttrib.transparent;`
	`213`	`+ this.transparent = this.requestAttrib.transparent \|\| (this.blendMode !== THREE.NormalBlending && this.blendMode !== THREE.NoBlending);`
`214`	`214`
`215`	`215`	`this.vertexShader = [`
`216`	`216`	`this.prefixCode,`