From c14e352d2ceb62288349bfc7afa4453d6cf38646 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 19 Dec 2019 15:48:33 +1100 Subject: Fix error in recent gizmo tweak workaround --- source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c') diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index f176f0e5df4..c3dfdd9a419 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -407,7 +407,7 @@ static void gizmomap_prepare_drawing(wmGizmoMap *gzmap, for (wmGizmoGroup *gzgroup = gzmap->groups.first; gzgroup; gzgroup = gzgroup->next) { /* check group visibility - drawstep first to avoid unnecessary call of group poll callback */ - if ((gzgroup->hide.any != 0) || !wm_gizmogroup_is_visible_in_drawstep(gzgroup, drawstep) || + if (!wm_gizmogroup_is_visible_in_drawstep(gzgroup, drawstep) || !WM_gizmo_group_type_poll(C, gzgroup->type)) { continue; } @@ -422,6 +422,11 @@ static void gizmomap_prepare_drawing(wmGizmoMap *gzmap, /* Calls `setup`, `setup_keymap` and `refresh` if they're defined. */ WM_gizmogroup_ensure_init(C, gzgroup); + /* Check after ensure which can run refresh and update this value. */ + if (gzgroup->hide.any != 0) { + continue; + } + /* prepare drawing */ if (gzgroup->type->draw_prepare) { gzgroup->type->draw_prepare(C, gzgroup); -- cgit v1.2.3