diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-05-31 21:25:03 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-05-31 21:25:03 +0000 |
| commit | b27aa056a0dca761edfa2f58c8ddfee7de8f8f04 (patch) | |
| tree | 875823cd2e1ec8ccefff6bff17c6737dba06eb52 /indra/newview/app_settings/shaders/class1/deferred | |
| parent | 4d5c0fe3efa3bc60b114623180d8830125115359 (diff) | |
| parent | 58f7b981bdb415311f23dfffc39e7a841b3017a0 (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #410)
SL-11337, SL-11221, SL-11339
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl index 93359e0d4c..1ed25d1dba 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl @@ -240,7 +240,7 @@ void main() vec3 sun_contrib = min(final_da, shadow) * sunlit; #if !defined(AMBIENT_KILL) - color.rgb = amblit; + color.rgb = amblit * 0.5; color.rgb *= ambient; #endif diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl index 4701157909..8e0b903d04 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl @@ -332,7 +332,7 @@ void main() vec3 sun_contrib = min(final_da, shadow) * sunlit; #if !defined(AMBIENT_KILL) - color.rgb = amblit; + color.rgb = amblit * 0.5; color.rgb *= ambient; #endif diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index e07b31b3c1..5b03fbaa50 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -111,7 +111,7 @@ void main() vec3 sun_contrib = final_da * sunlit; #if !defined(AMBIENT_KILL) - color.rgb = amblit; + color.rgb = amblit * 0.5; color.rgb *= ambient; #endif |