diff options
author | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
commit | ea40b3a37b0f9b7e09e999a2c6529905e251ecad (patch) | |
tree | 9cfb5603040efc7738bca633b902c190db28b0bf /indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl | |
parent | ebc604fa8d12fb08fda1ac55aae817ad0135bb6b (diff) | |
parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) |
Merge with viewer 3.6.0
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl index 58984a4263..5886fc65be 100755 --- a/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightFullbrightShinyWaterF.glsl @@ -48,7 +48,7 @@ void fullbright_shiny_lighting_water() color.rgb = fullbrightShinyAtmosTransport(color.rgb); color.rgb = fullbrightScaleSoftClip(color.rgb); - color.a = max(color.a, vertex_color.a); + color.a = 1.0; frag_color = applyWaterFog(color); } |