diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
| commit | 9acabccdde5cff91cac3bae0502c8ff5b26cada6 (patch) | |
| tree | b6fc95044fc41cdc43969195f9c1939e8ecb0158 /indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl | |
| parent | dd2ede9991a9a31821fbe43a7fa17a5aafa19542 (diff) | |
| parent | 7fa8c2313b47959ba8c0a40d92461f6892e0d0d3 (diff) | |
merge changes for 3.6.0-materials-beta1
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl index b68240ba0d..3426fea52f 100755 --- a/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightWaterAlphaMaskF.glsl @@ -39,7 +39,9 @@ VARYING vec2 vary_texcoord0; void default_lighting_water() { - vec4 color = diffuseLookup(vary_texcoord0.xy) * vertex_color; + vec4 color = diffuseLookup(vary_texcoord0.xy); + + color.rgb *= vertex_color.rgb; if (color.a < minimum_alpha) { |