From 2ff79613a8335c43285c8d1e710d0f9e592dd8ff Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 4 Dec 2018 13:00:10 +1100 Subject: [PATCH] Fix T58670: Spin tool crashes w/o gizmo overlay --- source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index ec8e012b1a7..00ffc3de861 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -1039,7 +1039,9 @@ void WM_gizmomap_message_subscribe( bContext *C, wmGizmoMap *gzmap, ARegion *ar, struct wmMsgBus *mbus) { for (wmGizmoGroup *gzgroup = gzmap->groups.first; gzgroup; gzgroup = gzgroup->next) { - if (!WM_gizmo_group_type_poll(C, gzgroup->type)) { + if ((gzgroup->init_flag & WM_GIZMOGROUP_INIT_SETUP) == 0 || + !WM_gizmo_group_type_poll(C, gzgroup->type)) + { continue; } for (wmGizmo *gz = gzgroup->gizmos.first; gz; gz = gz->next) {