From 0b626703f99fb7146915f4be9e7013bae0c64c61 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 22 Feb 2020 10:41:19 +1100 Subject: Cleanup: internal changes to cursor resetting - Move gizmo cursor check into ED_region_cursor_set so the result of calling this function is the same as flagging for cursor update. - Use tagging in ui_popup_block_remove which avoids adding a mouse-move event in case the cursor needs to be changed again. --- source/blender/editors/screen/screen_edit.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'source/blender/editors/screen/screen_edit.c') diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 8e0e8116da2..23a6704a617 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -403,11 +403,6 @@ static void region_cursor_set_ex(wmWindow *win, ScrArea *sa, ARegion *ar, bool s BLI_assert(WM_window_get_active_screen(win)->active_region == ar); if (sa->flag & AREA_FLAG_CURSOR_UPDATE || swin_changed || (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; - } - } ED_region_cursor_set(win, sa, ar); } } -- cgit v1.2.3