diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-02-21 17:59:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-21 17:59:36 +0300 |
commit | 4653d253b390fbb61163610d60ac4c0d21db23ae (patch) | |
tree | 6e57fc8864f5d664afd74406fa9e8002740818ac /source/blender/editors | |
parent | 803636f888c1f74d73bf4f09ed396647c869a4a3 (diff) |
Fix T67805: Cursor doesn't update when switching tools via shortcuts
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 1520566cd9d..216f36775b2 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -406,7 +406,9 @@ static void region_cursor_set(wmWindow *win, bool swin_changed) { for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) { if (ar == screen->active_region) { - if (swin_changed || (ar->type && ar->type->event_cursor)) { + if (swin_changed || (sa->flag & AREA_FLAG_CURSOR_UPDATE) || + (ar->type && ar->type->event_cursor)) { + sa->flag &= ~AREA_FLAG_CURSOR_UPDATE; if (ar->gizmo_map != NULL) { if (WM_gizmomap_cursor_set(ar->gizmo_map, win)) { return; |