Commit: 2b36e6bee6ccf5c75708b7fe3815736f426164cb
Author: Philipp Oeser
Date: Tue Sep 15 17:50:45 2020 +0200
Branches: master
https://developer.blender.org/rB2b36e6bee6ccf5c75708b7fe3815736f426164cb
Fix T80333: cursor disappears after using navigation gizmo in editmode
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
===================================================================
M source/blender/windowmanager/intern/wm_cursors.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_cursors.c
b/source/blender/windowmanager/intern/wm_cursors.c
index 838a1328bdc..6233df356dd 100644
--- a/source/blender/windowmanager/intern/wm_cursors.c
+++ b/source/blender/windowmanager/intern/wm_cursors.c
@@ -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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
