Merge remote-tracking branch 'evanw/master' into dev

src/extras/ShaderUtils.js

@@ -302,9 +302,9 @@ THREE.ShaderUtils = {
 				"void main() {",
 
 					"vec4 mPosition = objectMatrix * vec4( position, 1.0 );",
-					"vViewPosition = cameraPosition - mPosition.xyz;",
 
 					"vec4 mvPosition = modelViewMatrix * vec4( position, 1.0 );",
+					"vViewPosition = -mvPosition.xyz;",
 					"vNormal = normalize( normalMatrix * normal );",
 
 					// tangent and binormal vectors