diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-09 14:36:28 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-09 15:05:57 +0300 |
| commit | 3e2422a9471b7fccdd1de57ed06f3a0b95f5bb0a (patch) | |
| tree | 910dbcdc8c9d74820bb14b9245aff6df666425f8 /source/blender/editors/interface/interface_icons.c | |
| parent | f1959f09990b9ba2ae8e7ad07d3f67caebd6a1b3 (diff) | |
Fix T57115: buttons drawing wrong after recent icon drawing changes.
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 5c53fbb739b..bedc4ac92cf 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1332,7 +1332,6 @@ static void icon_draw_cache_flush_ex(void) return; /* We need to flush widget base first to ensure correct ordering. */ - GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); UI_widgetbase_draw_cache_flush(); GPU_blend_set_func(GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); @@ -1354,6 +1353,8 @@ static void icon_draw_cache_flush_ex(void) glBindTexture(GL_TEXTURE_2D, 0); g_icon_draw_cache.calls = 0; + + GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); } void UI_icon_draw_cache_end(void) @@ -1366,11 +1367,7 @@ void UI_icon_draw_cache_end(void) return; GPU_blend(true); - GPU_blend_set_func(GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); - icon_draw_cache_flush_ex(); - - GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); GPU_blend(false); } |