diff options
author | Runitai Linden <davep@lindenlab.com> | 2020-03-05 11:58:58 -0600 |
---|---|---|
committer | Runitai Linden <davep@lindenlab.com> | 2020-03-05 11:58:58 -0600 |
commit | d33655828c104d1afe484b63093ad5aab1571a3c (patch) | |
tree | 3b188e357512e48f05f39e4926d054b8e5c2bedc /indra | |
parent | ca5cc79dfbc55a2160212f213a1a622691b7f02e (diff) |
Reenable water fog in materialF.glsl (oops)
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/materialF.glsl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index 586ce4a9b7..18293f4c11 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -421,16 +421,16 @@ void main() color = scaleSoftClipFrag(color); -/*#ifdef WATER_FOG +#ifdef WATER_FOG vec4 temp = applyWaterFogView(pos, vec4(color.rgb, al)); color.rgb = temp.rgb; al = temp.a; -#endif*/ +#endif } - - color.rgb = linear_to_srgb(color.rgb); + color.rgb = linear_to_srgb(color.rgb); + frag_color = vec4(color, al); #else // mode is not DIFFUSE_ALPHA_MODE_BLEND, encode to gbuffer |