summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-07-11 00:01:12 +0100
committerGraham Linden <graham@lindenlab.com>2018-07-11 00:01:12 +0100
commit5fade93da8a1b832a1dbfd494a18e7b441b5feab (patch)
treed2c9c68345dda928b05f2953e60d7e510c526705 /indra/newview/app_settings
parentffdd6c3d7dad87e9873067a923d4e7ce9e6d4d2c (diff)
Make moon/star rendering handle transitions between settings w defined textures and settings without better.
Reverse direction of mix to match blend_factor values in stars shader.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/starsF.glsl2
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;