diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-02 19:24:11 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-02 19:24:11 -0400 |
| commit | 93099e22897c8650927b0dc90a4a38e2a7cf81d8 (patch) | |
| tree | 8ece11bb06e670cc9b8d22153ec1ec149a0ca384 /indra/newview/app_settings/shaders/class1/interface | |
| parent | 1791685ba359eb7bbaa8f4291e6f0d0453bf09e0 (diff) | |
| parent | 5711fda52f3939f482358ad5265618fb56da5998 (diff) | |
merge changes for storm-1535
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); } |