From b9b0255272067f127f5967e082fb30ac5408ccef Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 26 Jul 2011 18:38:49 -0500 Subject: SH-2179 Fix for active UI elements glowing when basic shaders enabled. --- indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/shaders/class1') diff --git a/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl b/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl index ae943cc438..5b7cc57574 100644 --- a/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl @@ -9,7 +9,7 @@ uniform sampler2D tex0; void main() { - float alpha = texture2D(tex0, gl_TexCoord[0].xy).a; + float alpha = texture2D(tex0, gl_TexCoord[0].xy).a * gl_Color.a; gl_FragColor = vec4(gl_Color.rgb, alpha); } -- cgit v1.2.3