diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
| commit | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (patch) | |
| tree | 623156a93d159ece460a31590701d7cbdc701cdc /indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl | |
| parent | 610764fbfce75f54c95d4b10c2a8f9482a7a7b80 (diff) | |
| parent | 2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl index 338d0ebb2b..26355731ae 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl @@ -1,5 +1,5 @@ /** - * @file diffuseF.glsl + * @file diffuseAlphaMaskF.glsl * * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * $/LicenseInfo$ @@ -15,7 +15,7 @@ varying vec3 vary_normal; void main() { - vec4 col = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy) * gl_Color; + vec4 col = texture2D(diffuseMap, gl_TexCoord[0].xy) * gl_Color; if (col.a < minimum_alpha || col.a > maximum_alpha) { |