merge

2011-07-26 18:39:12 -05:00 · 2011-07-26 18:39:12 -05:00 · d11891bfc2
parent a9c6b5d808 b9b0255272
commit d11891bfc2
1 changed files with 1 additions and 1 deletions
--- 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);
 }