Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix incorrect drawing of material list outline, after recent changes.

Browse Source 
For draw cache flushing the default blend mode needs to be set.
This commit is contained in:
Brecht Van Lommel
2019-01-03 15:38:22 +01:00
parent 481a75a08a
commit d98ec04341
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/interface/interface_icons.c
View File

@@ -1307,9 +1307,6 @@ static void icon_draw_rect(float x, float y, int w, int h, float UNUSED(aspect),
rect = ima->rect; rect = ima->rect;
} }
/* We need to flush widget base first to ensure correct ordering. */
UI_widgetbase_draw_cache_flush();
/* draw */ /* draw */
GPUBuiltinShader shader; GPUBuiltinShader shader;
if (desaturate != 0.0f) { if (desaturate != 0.0f) {
@@ -1513,17 +1510,15 @@ static void icon_draw_size(
DrawInfo *di = icon_ensure_drawinfo(icon); DrawInfo *di = icon_ensure_drawinfo(icon);
if (di->type == ICON_TYPE_VECTOR) {
/* We need to flush widget base first to ensure correct ordering. */ /* We need to flush widget base first to ensure correct ordering. */
UI_widgetbase_draw_cache_flush(); UI_widgetbase_draw_cache_flush();
if (di->type == ICON_TYPE_VECTOR) {
/* vector icons use the uiBlock transformation, they are not drawn /* vector icons use the uiBlock transformation, they are not drawn
* with untransformed coordinates like the other icons */ * with untransformed coordinates like the other icons */
di->data.vector.func((int)x, (int)y, w, h, 1.0f); di->data.vector.func((int)x, (int)y, w, h, 1.0f);
} }
else if (di->type == ICON_TYPE_GEOM) { else if (di->type == ICON_TYPE_GEOM) {
/* We need to flush widget base first to ensure correct ordering. */
UI_widgetbase_draw_cache_flush();
#ifdef USE_UI_TOOLBAR_HACK #ifdef USE_UI_TOOLBAR_HACK
/* TODO(campbell): scale icons up for toolbar, we need a way to detect larger buttons and do this automatic. */ /* TODO(campbell): scale icons up for toolbar, we need a way to detect larger buttons and do this automatic. */
{ {
@@ -1547,7 +1542,8 @@ static void icon_draw_size(
ibuf = BKE_icon_geom_rasterize(icon->obj, w, h); ibuf = BKE_icon_geom_rasterize(icon->obj, w, h);
di->data.geom.image_cache = ibuf; di->data.geom.image_cache = ibuf;
} }
glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
GPU_blend_set_func_separate(GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
icon_draw_rect(x, y, w, h, aspect, w, h, ibuf->rect, alpha, rgb, desaturate); icon_draw_rect(x, y, w, h, aspect, w, h, ibuf->rect, alpha, rgb, desaturate);
GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
} }
@@ -1591,9 +1587,7 @@ static void icon_draw_size(
#endif #endif
if (!iimg->rect) return; /* something has gone wrong! */ if (!iimg->rect) return; /* something has gone wrong! */
GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
icon_draw_rect(x, y, w, h, aspect, iimg->w, iimg->h, iimg->rect, alpha, rgb, desaturate); icon_draw_rect(x, y, w, h, aspect, iimg->w, iimg->h, iimg->rect, alpha, rgb, desaturate);
GPU_blend_set_func_separate(GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);
} }
else if (di->type == ICON_TYPE_PREVIEW) { else if (di->type == ICON_TYPE_PREVIEW) {
PreviewImage *pi = (icon->id_type != 0) ? BKE_previewimg_id_ensure((ID *)icon->obj) : icon->obj; PreviewImage *pi = (icon->id_type != 0) ? BKE_previewimg_id_ensure((ID *)icon->obj) : icon->obj;
@@ -1611,9 +1605,6 @@ static void icon_draw_size(
else if (di->type == ICON_TYPE_GPLAYER) { else if (di->type == ICON_TYPE_GPLAYER) {
BLI_assert(icon->obj != NULL); BLI_assert(icon->obj != NULL);
/* We need to flush widget base first to ensure correct ordering. */
UI_widgetbase_draw_cache_flush();
/* Just draw a colored rect - Like for vicon_colorset_draw() */ /* Just draw a colored rect - Like for vicon_colorset_draw() */
#ifndef WITH_HEADLESS #ifndef WITH_HEADLESS
vicon_gplayer_color_draw(icon, (int)x, (int)y, w, h); vicon_gplayer_color_draw(icon, (int)x, (int)y, w, h);