diff options
author | Graham Linden <graham@lindenlab.com> | 2019-05-07 15:09:30 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-05-07 15:09:30 -0700 |
commit | 570bbdb779f5e4be0c1804862bdffc9c5a1beb1b (patch) | |
tree | d385cf1b353b3d31b022c29a224b538b272ac1b8 /indra/newview/app_settings | |
parent | c61f73321dbef9f0f5741830bfbaa8facd6ec060 (diff) |
Fix diffuse boost which we don't want underwater, but do want in other cases.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 4 | ||||
-rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index fb9f6d7f37..b6e3951ee3 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -153,6 +153,10 @@ vec3 post_diffuse = color.rgb; vec3 post_spec = color.rgb; +#ifndef WATER_FOG + color.rgb += diffuse_srgb.a * diffuse_srgb.rgb; +#endif + if (envIntensity > 0.0) { //add environmentmap vec3 env_vec = env_mat * refnormpersp; diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 73b4473be5..03e5143fca 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -163,6 +163,10 @@ vec3 post_diffuse = color.rgb; vec3 post_spec = color.rgb; +#ifndef WATER_FOG + color.rgb += diffuse_srgb.a * diffuse_srgb.rgb; +#endif + if (envIntensity > 0.0) { //add environmentmap vec3 env_vec = env_mat * refnormpersp; |