diff options
author | Graham Linden <graham@lindenlab.com> | 2019-05-16 14:14:02 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-05-16 14:14:02 -0700 |
commit | b3c0218a31b9d7dd699cf3944bbcfc35e9adbd49 (patch) | |
tree | 862809250383d4246d6cc4eaf3c7336265bbb192 /indra/newview | |
parent | cce6254aec2de6606b4940d961cef6cceb549d61 (diff) |
Revert lighting changes for 10856 causing knock-on.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl | 4 | ||||
-rw-r--r-- | indra/newview/app_settings/shaders/class3/lighting/lightV.glsl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl index 6c22ef5636..68eb671e7c 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl @@ -137,7 +137,7 @@ void calcAtmosphericVars(vec3 inPositionEye, float ambFactor, out vec3 sunlit, o + tmpAmbient)); //brightness of surface both sunlight and ambient - sunlit = sunlight.rgb; - amblit = tmpAmbient.rgb; + sunlit = sunlight.rgb * 0.5; + amblit = tmpAmbient.rgb * .25; additive *= vec3(1.0 - temp1); } diff --git a/indra/newview/app_settings/shaders/class3/lighting/lightV.glsl b/indra/newview/app_settings/shaders/class3/lighting/lightV.glsl index 2f64ab25cb..48c883d98a 100644 --- a/indra/newview/app_settings/shaders/class3/lighting/lightV.glsl +++ b/indra/newview/app_settings/shaders/class3/lighting/lightV.glsl @@ -32,7 +32,7 @@ vec4 sumLights(vec3 pos, vec3 norm, vec4 color); vec4 calcLighting(vec3 pos, vec3 norm, vec4 color) { vec4 c = sumLights(pos, norm, color); - c.rgb += atmosAmbient() * color.rgb * 0.25; + c.rgb += atmosAmbient() * color.rgb; return c; } |