summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-07-24 12:17:39 -0700
committerGraham Linden <graham@lindenlab.com>2013-07-24 12:17:39 -0700
commite681d19ea678ae378807b2054d33b6b1abcb8b6b (patch)
tree9eec52ad01e59cb93d5aafe8acff9a8ebe316838 /indra
parentd6b4124fb96768aad8840490efa31d9b800cb3ea (diff)
MATBUG-306 regression fix, vert color applied in wrong colorspace
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/app_settings/shaders/class1/deferred/alphaF.glsl6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index f4298d2bde..e3be7a52ec 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -504,11 +504,11 @@ void main()
#else
vec4 diff = texture2D(diffuseMap,vary_texcoord0.xy);
#endif
- vec4 gamma_diff = diff;
-
- diff.rgb = srgb_to_linear(diff.rgb);
diff.rgb *= vertex_color.rgb;
+ vec4 gamma_diff = diff;
+ diff.rgb = srgb_to_linear(diff.rgb);
+
float final_alpha = diff.a * vertex_color.a;
vec3 norm = vary_norm;