[Bf-blender-cvs] [f2945f38959] master: UI: don't change mouse cursor while it's grabbed

Campbell Barton noreply at git.blender.org
Fri Dec 16 07:29:03 CET 2022


Commit: f2945f38959afb544a52a1d0d57be106c5dadf47
Author: Campbell Barton
Date:   Fri Dec 16 17:22:09 2022 +1100
Branches: master
https://developer.blender.org/rBf2945f38959afb544a52a1d0d57be106c5dadf47

UI: don't change mouse cursor while it's grabbed

The paint cursor was continuously set which meant hiding the cursor
while interacting with buttons would immediately show it again.

This exposed cursor warping.

===================================================================

M	source/blender/editors/sculpt_paint/paint_cursor.cc

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_cursor.cc b/source/blender/editors/sculpt_paint/paint_cursor.cc
index 15e45b8ac21..deb1fff946b 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.cc
+++ b/source/blender/editors/sculpt_paint/paint_cursor.cc
@@ -1400,6 +1400,11 @@ static void paint_cursor_sculpt_session_update_and_init(PaintCursorContext *pcon
 
 static void paint_update_mouse_cursor(PaintCursorContext *pcontext)
 {
+  if (pcontext->win->grabcursor != 0) {
+    /* Don't set the cursor while it's grabbed, since this will show the cursor when interacting
+     * with the UI (dragging a number button for e.g.), see: T102792. */
+    return;
+  }
   WM_cursor_set(pcontext->win, WM_CURSOR_PAINT);
 }



More information about the Bf-blender-cvs mailing list