diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-08-02 14:41:28 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-08-02 14:41:28 -0700 |
| commit | 8d081d34fc56fd1b742045dd120b6acbda0d027e (patch) | |
| tree | bad359d12509e1543db1d24970f18f8ba88d01a1 /indra/newview/app_settings/shaders/class1/interface | |
| parent | 75d2382dc3fd1beb190eba12188883db98278f89 (diff) | |
| parent | 9eb555bbe60e0f388593c489d6c473e4adcbd956 (diff) | |
Sync with lindenlab/viewer-development
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface')
| -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); } |