diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-07-25 03:53:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-07-25 03:53:04 +0300 |
| commit | 76dfbee423e8ba886fd72bca7ae9e6f220c59844 (patch) | |
| tree | d07998715ef1e5d5096b992f1d9d2265e993cb5e /source/blender/windowmanager | |
| parent | bfe580642f46539ba85341fa8db451c52afd0cb4 (diff) | |
Fix T67472: Gizmo overlap causes cursor to get stuck
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index 534474a6221..ee96515c27f 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -973,7 +973,8 @@ bool WM_gizmomap_cursor_set(const wmGizmoMap *gzmap, wmWindow *win) bool wm_gizmomap_highlight_set(wmGizmoMap *gzmap, const bContext *C, wmGizmo *gz, int part) { if ((gz != gzmap->gzmap_context.highlight) || (gz && part != gz->highlight_part)) { - const bool init_last_cursor = (gzmap->gzmap_context.highlight == NULL); + const bool init_last_cursor = !(gzmap->gzmap_context.highlight && + gzmap->gzmap_context.last_cursor != -1); if (gzmap->gzmap_context.highlight) { gzmap->gzmap_context.highlight->state &= ~WM_GIZMO_STATE_HIGHLIGHT; gzmap->gzmap_context.highlight->highlight_part = -1; |