diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-06-18 13:41:53 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-06-18 13:41:53 -0700 |
| commit | 782ddfdb48e1bdf6995783c11342eed2de4a30bb (patch) | |
| tree | 7e6a8690153bd568bbba5e2ecacac860a9bcf255 /indra/newview/app_settings | |
| parent | 4abb342e9564a7740475c3abe60cd62ae5bbc34d (diff) | |
SL-11041
Revert fix for SL_11406 causing regression of SL-11041
Diffstat (limited to 'indra/newview/app_settings')
3 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index 5fb3dc12e6..0d180e5798 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -111,8 +111,8 @@ void main() vec3 sun_contrib = final_da * sunlit; #if !defined(AMBIENT_KILL) - color.rgb = amblit * 2.0; - color.rgb *= ambient * 0.5; + color.rgb = amblit; + color.rgb *= ambient; #endif vec3 post_ambient = color.rgb; diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 53cdce4cb1..23ed3fb3d9 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -119,8 +119,8 @@ void main() vec3 sun_contrib = min(scol, final_da) * sunlit; #if !defined(AMBIENT_KILL) - color.rgb = amblit * 2.0; - color.rgb *= ambient * 0.5; + color.rgb = amblit; + color.rgb *= ambient; #endif vec3 post_ambient = color.rgb; diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl index ee745b48c2..ee9c990b12 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsF.glsl @@ -36,8 +36,8 @@ vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten) return light; } light *= atten.r; - light += additive * 2.0; - return light; + light += additive; + return light * 2.0; } vec3 atmosLighting(vec3 light) |