diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 06:19:43 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-26 06:19:43 -0700 |
commit | f07e0d9760053a9814fc410a7c9f0f8192c8bd39 (patch) | |
tree | d59f4aa7f4c2c31ff290671cf76a905d14833e72 /indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterNonIndexedF.glsl | |
parent | fd447189c5e05df53cd8ec0a4168370c03c3bb16 (diff) | |
parent | 6f953cc97b90eff43d69c2bda28fc9863fc57214 (diff) |
Merge viewer-dev-mat and fix llvovolume.cpp missed sunshine merges
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterNonIndexedF.glsl')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterNonIndexedF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterNonIndexedF.glsl index f3bd662364..0b6e835fd0 100755 --- a/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterNonIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterNonIndexedF.glsl @@ -48,7 +48,7 @@ void shiny_lighting_water() color.rgb = mix(color.rgb, envColor.rgb, vertex_color.a); color.rgb = atmosLighting(color.rgb); - color.a = max(color.a, vertex_color.a); + color.a = 1.0; frag_color = applyWaterFog(color); } |