diff options
author | Graham Madarasz <graham@lindenlab.com> | 2019-05-17 22:41:22 +0000 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2019-05-17 22:41:22 +0000 |
commit | 21d08842009532ac79c6dfd8657552975c937804 (patch) | |
tree | 1de28afff655c1117b04503e87d4ba8b7b15b287 | |
parent | a4e96516456c2fee10d84ca7f6c9e234885d720f (diff) | |
parent | 7f3f69002b7c7612fc89a3c5c571066a34e5baff (diff) |
Merged in graham_linden/viewer-eep-g (pull request #401)
SL-11220
-rw-r--r-- | indra/newview/app_settings/shaders/class2/windlight/atmosphericsHelpersV.glsl | 2 | ||||
-rw-r--r-- | indra/newview/app_settings/shaders/class2/windlight/transportF.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsHelpersV.glsl index 9f049cb8fb..9c42b84eca 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/atmosphericsHelpersV.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/atmosphericsHelpersV.glsl @@ -37,7 +37,7 @@ uniform int no_atmo; vec3 atmosAmbient() { - if (no_atmo == 1) return vec3(0.66); + if (no_atmo == 1) return vec3(0.16); return getAmblitColor(); } diff --git a/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl b/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl index 2de708d94b..f9d2a36818 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/transportF.glsl @@ -36,7 +36,7 @@ vec3 atmosTransportFrag(vec3 light, vec3 additive, vec3 atten) { if (no_atmo == 1) { - return light; + return light * 2.0; } light *= atten.r; light += additive; |