[Bf-blender-cvs] [d442e0ad63a] blender2.8: UI: Fix T54691: Vector icon vs Widget base ordering.
Clément Foucault
noreply at git.blender.org
Tue Apr 17 15:54:02 CEST 2018
Commit: d442e0ad63ac54c92acc4d66af9b1e27c025a23e
Author: Clément Foucault
Date: Tue Apr 17 15:53:49 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd442e0ad63ac54c92acc4d66af9b1e27c025a23e
UI: Fix T54691: Vector icon vs Widget base ordering.
It was making keyframe marker and bone theme color icon disappear under
their button.
===================================================================
M source/blender/editors/interface/interface_icons.c
===================================================================
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 682eac6a352..04de8f6c94c 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1211,6 +1211,8 @@ static void icon_draw_size(
h = (int)(fdraw_size / aspect + 0.5f);
if (di->type == ICON_TYPE_VECTOR) {
+ /* We need to flush widget base first to ensure correct ordering. */
+ UI_widgetbase_draw_cache_flush();
/* vector icons use the uiBlock transformation, they are not drawn
* with untransformed coordinates like the other icons */
di->data.vector.func((int)x, (int)y, w, h, 1.0f);
More information about the Bf-blender-cvs
mailing list