minor fixes for premultiplied alpha option on materials.

src/renderers/shaders/ShaderChunk/premultiply_alpha_fragment.glsl → src/renderers/shaders/ShaderChunk/premultiplied_alpha_fragment.glsl

@@ -1,4 +1,4 @@
-#if PREMULTIPLIED_ALPHA
+#ifdef PREMULTIPLIED_ALPHA
 
   // Get get normal blending with premultipled, use with CustomBlending, OneFactor, OneMinusSrcAlphaFactor, AddEquation.
   gl_FragColor.rgb *= gl_FragColor.a;

src/renderers/shaders/ShaderLib/linedashed_frag.glsl

@@ -30,6 +30,6 @@ void main() {
 	gl_FragColor = linearToOutputTexel( vec4( outgoingLight, diffuseColor.a ) );
 
 	#include <fog_fragment>
-	#include <premultiply_alpha_fragment>
+	#include <premultiplied_alpha_fragment>
 
 }

src/renderers/shaders/ShaderLib/meshbasic_frag.glsl

@@ -45,6 +45,6 @@ void main() {
 	gl_FragColor = linearToOutputTexel( vec4( outgoingLight, diffuseColor.a ) );
 
 	#include <fog_fragment>
-	#include <premultiply_alpha_fragment>
+	#include <premultiplied_alpha_fragment>
 
 }

src/renderers/shaders/ShaderLib/meshlambert_frag.glsl

@@ -72,6 +72,6 @@ void main() {
 	gl_FragColor = linearToOutputTexel( vec4( outgoingLight, diffuseColor.a ) );
 
 	#include <fog_fragment>
-	#include <premultiply_alpha_fragment>
+	#include <premultiplied_alpha_fragment>
 
 }

src/renderers/shaders/ShaderLib/meshphong_frag.glsl

@@ -56,6 +56,6 @@ void main() {
 	gl_FragColor = linearToOutputTexel( vec4( outgoingLight, diffuseColor.a ) );
 
 	#include <fog_fragment>
-	#include <premultiply_alpha_fragment>
+	#include <premultiplied_alpha_fragment>
 
 }

src/renderers/shaders/ShaderLib/meshstandard_frag.glsl

@@ -68,6 +68,6 @@ void main() {
 	gl_FragColor = linearToOutputTexel( vec4( outgoingLight, diffuseColor.a ) );
 
 	#include <fog_fragment>
-	#include <premultiply_alpha_fragment>
+	#include <premultiplied_alpha_fragment>
 
 }

src/renderers/webgl/WebGLProgram.js

@@ -491,7 +491,7 @@ THREE.WebGLProgram = ( function () {
 				parameters.shadowMapEnabled ? '#define ' + shadowMapTypeDefine : '',
 				parameters.pointLightShadows > 0 ? '#define POINT_LIGHT_SHADOWS' : '',
 
-				parameters.premultipliedAlpha ? "#define PREMULTIPLIED_ALPHA" : ''
+				parameters.premultipliedAlpha ? "#define PREMULTIPLIED_ALPHA" : '',
 
 				parameters.logarithmicDepthBuffer ? '#define USE_LOGDEPTHBUF' : '',
 				parameters.logarithmicDepthBuffer && renderer.extensions.get( 'EXT_frag_depth' ) ? '#define USE_LOGDEPTHBUF_EXT' : '',

utils/build/includes/common.json

@@ -132,7 +132,7 @@
 	"src/renderers/shaders/ShaderChunk/color_pars_vertex.glsl",
 	"src/renderers/shaders/ShaderChunk/color_vertex.glsl",
 	"src/renderers/shaders/ShaderChunk/common.glsl",
-	"src/renderers/shaders/ShaderChunk/cube_uv_reflection_fragment.glsl",	
+	"src/renderers/shaders/ShaderChunk/cube_uv_reflection_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl",
 	"src/renderers/shaders/ShaderChunk/displacementmap_vertex.glsl",
 	"src/renderers/shaders/ShaderChunk/displacementmap_pars_vertex.glsl",
@@ -171,6 +171,7 @@
 	"src/renderers/shaders/ShaderChunk/morphtarget_vertex.glsl",
 	"src/renderers/shaders/ShaderChunk/normal_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/normalmap_pars_fragment.glsl",
+	"src/renderers/shaders/ShaderChunk/premultiplied_alpha_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/project_vertex.glsl",
 	"src/renderers/shaders/ShaderChunk/roughnessmap_fragment.glsl",
 	"src/renderers/shaders/ShaderChunk/roughnessmap_pars_fragment.glsl",