diff options
author | Graham Linden <graham@lindenlab.com> | 2019-02-26 10:16:52 -0800 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-02-26 10:16:52 -0800 |
commit | 982b8cdef280469d6c04ce9886a8cadaf6d8350c (patch) | |
tree | c9d927b3b903d9351a67f7bab23e33a35f11d2b8 /indra/newview/app_settings | |
parent | f9896dc100ccd6dd2d92610cb4f71f61284f76a6 (diff) | |
parent | b6d08e489c1e80ba474060d0968db11fe18249ea (diff) |
Merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl | 1 | ||||
-rw-r--r-- | indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl index 17494361f0..1fb337498c 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl @@ -52,6 +52,7 @@ void main() c.rgb = fullbrightAtmosTransport(c.rgb); c.rgb = fullbrightScaleSoftClip(c.rgb); + // SL-9806 stars poke through //c.a *= sun_fade; frag_data[0] = c; diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl index 5b6fefcad9..d85ce004a5 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl @@ -48,7 +48,7 @@ void main() vec4 sunB = texture2D(altDiffuseMap, vary_texcoord0.xy); vec4 c = mix(sunA, sunB, blend_factor); -// SL-9806 +// SL-9806 stars poke through // c.a *= sun_fade; c.rgb = pow(c.rgb, vec3(0.7f)); |