diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-21 16:23:50 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-21 16:23:50 -0500 |
| commit | 90ebaeef9b629cb63e7a94a526478f2e340ff439 (patch) | |
| tree | 14f61c7fc6c2c41cace22a9582075d54ad8181bc /indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl | |
| parent | 63c420d8ddb7cc738877d2771b1c3b8972a4de09 (diff) | |
| parent | ee4fdd2c18c722164d78a7305777fad6e49cba8b (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 933e50fed1..e1dc1de0af 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=2011&license=viewerlgpl$ * Second Life Viewer Source Code @@ -33,7 +33,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) { |