diff options
| author | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
| commit | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (patch) | |
| tree | 43935b338c5a87ca32f9240389470a96271fa1f5 /indra/newview/app_settings/shaders/class1/interface | |
| parent | 8b09dfb8907c364f09ee82d00926219ae52b5ee9 (diff) | |
| parent | 7cc7d143837f2b75f750c139e33fdf5afa8a8866 (diff) | |
Automated merge with file:///e:\code\viewer-experience
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); } |