diff options
author | simon <none@none> | 2014-02-10 16:11:50 -0800 |
---|---|---|
committer | simon <none@none> | 2014-02-10 16:11:50 -0800 |
commit | cb2045fcd5106b5e0028869fc6a3e080d3f8e779 (patch) | |
tree | 8270c7d248f542107472fff9f2eb10f30721e1ee /indra/newview/app_settings/shaders/class1/deferred | |
parent | 8e5da5125de2bc9f8ce5ed2677556953e008c59d (diff) | |
parent | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (diff) |
Merge downstream code with viewer-release
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl index e5f7366b70..2b5f001873 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl @@ -534,6 +534,7 @@ void main() #ifdef FOR_IMPOSTOR vec4 color; color.rgb = diff.rgb; + color.a = 1.0; #ifdef USE_VERTEX_COLOR float final_alpha = diff.a * vertex_color.a; |