diff options
author | Rider Linden <rider@lindenlab.com> | 2018-07-10 23:04:45 +0000 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-07-10 23:04:45 +0000 |
commit | 658b2be775f3c33f4a23d6023a96741eee1849e5 (patch) | |
tree | c631eafd8cb162112536d586624278a16efd16a6 /indra/newview/app_settings/shaders/class1 | |
parent | 7724ace15248fefe35b7e1d567554833d6817f68 (diff) | |
parent | 5fade93da8a1b832a1dbfd494a18e7b441b5feab (diff) |
Merged in graham_linden/viewer-eep-graham (pull request #23)
Render fixes and performance improvement for advanced atmo codepath
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/starsF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl index d6a1edbf42..d7f655709c 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl @@ -44,7 +44,7 @@ void main() { vec4 col_a = texture2D(diffuseMap, vary_texcoord0.xy); vec4 col_b = texture2D(diffuseMap, vary_texcoord0.xy); - vec4 col = mix(col_a, col_b, blend_factor); + vec4 col = mix(col_b, col_a, blend_factor); col.rgb *= vertex_color.rgb; col.a *= custom_alpha; frag_color = col; |