diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-15 05:32:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-15 05:32:31 +0300 |
| commit | 90f6fd0a3651587b2f1e875b2537a5d007d77630 (patch) | |
| tree | 7925714ce68249ff062c32c2fe5427b9ecaae238 /source/blender/windowmanager/intern | |
| parent | 796abc90a8ba27aa0da5808790a9607d08df61d0 (diff) | |
Fix T60905: Crash using smooth tool
Tools were relying on gizmos drawing to initialize their gizmos,
now tool gizmos are initialized immediately.
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 8f4c2519e2d..ee32e045d29 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2071,7 +2071,10 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand if (ar != NULL) { wmGizmoMapType *gzmap_type = WM_gizmomaptype_ensure(&gzgt->gzmap_params); WM_gizmo_group_type_ensure_ptr_ex(gzgt, gzmap_type); - WM_gizmomaptype_group_init_runtime_with_region(gzmap_type, gzgt, ar); + wmGizmoGroup *gzgroup = WM_gizmomaptype_group_init_runtime_with_region(gzmap_type, gzgt, ar); + /* We can't rely on drawing to initialize gizmo's since disabling + * overlays/gizmos will prevent pre-drawing setup calls. (see T60905) */ + WM_gizmogroup_ensure_init(C, gzgroup); } } } |