From a89d131f2d4757dea20a17dbf50cb6f8ee3cebfd Mon Sep 17 00:00:00 2001 From: myconid Date: Thu, 9 Aug 2012 18:49:35 +0000 Subject: [PATCH] Added specular mapping for units This was SVN commit r12336. --- binaries/data/mods/public/shaders/glsl/model_common.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/binaries/data/mods/public/shaders/glsl/model_common.fs b/binaries/data/mods/public/shaders/glsl/model_common.fs index 395505dbad..4d9fca2891 100644 --- a/binaries/data/mods/public/shaders/glsl/model_common.fs +++ b/binaries/data/mods/public/shaders/glsl/model_common.fs @@ -195,7 +195,7 @@ void main() #if USE_SPECULAR || USE_SPECULAR_MAP vec3 specCol; float specPow; - #if USE_INSTANCING && USE_SPECULAR_MAP + #if USE_SPECULAR_MAP vec4 s = texture2D(specTex, coord); specCol = s.rgb; specular.a = s.a; @@ -218,7 +218,7 @@ void main() color += ambColor; - #if USE_INSTANCING && USE_SPECULAR_MAP && USE_SELF_LIGHT + #if USE_SPECULAR_MAP && USE_SELF_LIGHT color = mix(texdiffuse, color, specular.a); #endif