diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-03-04 19:52:50 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-03-04 19:52:50 +0000 |
| commit | d2120bb28192504a3de76c0af15c5a04adffa206 (patch) | |
| tree | ac06fa2cd4206dbe06531947b0bfaf61d5f2d231 /indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | |
| parent | c40dd9917ffa9711f883d2a3ea57855bb98a7e23 (diff) | |
| parent | 1ba0df9abe26a18f2c870210be9b8fe6a1c72699 (diff) | |
Merged in BUG-228263 (pull request #20)
BUG-228263, roll back several PRs that broke alpha blending
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl index 39ed9a6e82..c104dc884f 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl @@ -86,6 +86,7 @@ void main() color.a = final_alpha; #endif - frag_color = color; + frag_color.rgb = color.rgb; + frag_color.a = color.a; } |