archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T80333: cursor disappears after using navigation gizmo in editmode

Browse Source 
Caused by rBe490dc4346db: UI: Skip unnecessary cursor setting

Above commit returned early if the cursor was already set, but did this
before visibility was regained, now return (still early) after setting
visibility.

Reviewed by @Severin in T80333
This commit is contained in:
Philipp Oeser
2020-09-15 17:50:45 +02:00
parent f59ce4d55c
commit 2b36e6bee6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/windowmanager/intern/wm_cursors.c
View File

@@ -149,12 +149,6 @@ void WM_cursor_set(wmWindow *win, int curs)
curs = win->modalcursor;
}
if (win->cursor == curs) {
return; /* Cursor is already set */
}
win->cursor = curs;
if (curs == WM_CURSOR_NONE) {
GHOST_SetCursorVisibility(win->ghostwin, 0);
return;
@@ -162,6 +156,12 @@ void WM_cursor_set(wmWindow *win, int curs)
GHOST_SetCursorVisibility(win->ghostwin, 1);
if (win->cursor == curs) {
return; /* Cursor is already set */
}
win->cursor = curs;
if (curs < 0 || curs >= WM_CURSOR_NUM) {
BLI_assert(!"Invalid cursor number");
return;