From e681d19ea678ae378807b2054d33b6b1abcb8b6b Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 24 Jul 2013 12:17:39 -0700 Subject: MATBUG-306 regression fix, vert color applied in wrong colorspace --- indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra') 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; -- cgit v1.2.3