From 8b0e2e4c82ae598f09a1f0cbf5d216804461155b Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Mon, 25 Feb 2019 12:12:29 -0800 Subject: SL-9806 Remove blend effect when sun disc nears horizon (was letting the stars show through). --- indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl | 2 +- indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl index 5bb2020971..17494361f0 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl @@ -52,7 +52,7 @@ void main() c.rgb = fullbrightAtmosTransport(c.rgb); c.rgb = fullbrightScaleSoftClip(c.rgb); - c.a *= sun_fade; + //c.a *= sun_fade; frag_data[0] = c; frag_data[1] = vec4(0.0f); diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl index 668379164d..5b6fefcad9 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl @@ -47,7 +47,9 @@ void main() vec4 sunA = texture2D(diffuseMap, vary_texcoord0.xy); vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy); vec4 c = mix(sunA, sunB, blend_factor); - c.a *= sun_fade; + +// SL-9806 +// c.a *= sun_fade; c.rgb = pow(c.rgb, vec3(0.7f)); c.rgb = fullbrightAtmosTransport(c.rgb); -- cgit v1.2.3