Browse Source

Merge remote-tracking branch 'tapio/normalmap-transparent' into dev

Mr.doob 12 years ago
parent
commit
aaceceb00d
1 changed files with 6 additions and 0 deletions
  1. 6 0
      src/loaders/Loader.js

+ 6 - 0
src/loaders/Loader.js

@@ -420,6 +420,12 @@ THREE.Loader.prototype = {
 			var parameters = { fragmentShader: shader.fragmentShader, vertexShader: shader.vertexShader, uniforms: uniforms, lights: true, fog: true };
 			var material = new THREE.ShaderMaterial( parameters );
 
+			if ( mpars.transparent ) {
+
+				material.transparent = true;
+
+			}
+
 		} else {
 
 			var material = new THREE[ mtype ]( mpars );