diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-26 18:39:12 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-26 18:39:12 -0500 |
| commit | d11891bfc2737ccb15cb97e762f849fb888ff1bc (patch) | |
| tree | 40688e5d6eb46dcb07b276af1824e22e6082985c | |
| parent | a9c6b5d808c3ca83446563f6d898b46b5b385165 (diff) | |
| parent | b9b0255272067f127f5967e082fb30ac5408ccef (diff) | |
merge
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |