griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Campbell Barton
2023-10-12 16:00:26 +11:00
parent 3180f16cef 4e4fc8c276
commit 1eabc2d4cd
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/windowmanager/intern/wm_draw.cc
View File

@@ -232,6 +232,13 @@ static void wm_software_cursor_motion_clear()
g_software_cursor.xy[1] = -1;
}
static void wm_software_cursor_motion_clear_with_window(const wmWindow *win)
{
if (g_software_cursor.winid == win->winid) {
wm_software_cursor_motion_clear();
}
}
static void wm_software_cursor_draw_bitmap(const int event_xy[2],
const GHOST_CursorBitmapRef *bitmap)
{
@@ -1144,7 +1151,8 @@ static void wm_draw_window_onscreen(bContext *C, wmWindow *win, int view)
wm_software_cursor_motion_update(win);
}
else {
wm_software_cursor_motion_clear();
/* Checking the window is needed so one window doesn't clear the cursor state of another. */
wm_software_cursor_motion_clear_with_window(win);
}
}
@@ -1486,7 +1494,7 @@ static bool wm_draw_update_test_window(Main *bmain, bContext *C, wmWindow *win)
else {
/* Detect the edge case when the previous draw used the software cursor but this one doesn't,
* it's important to redraw otherwise the software cursor will remain displayed. */
if (g_software_cursor.winid != -1) {
if (g_software_cursor.winid == win->winid) {
return true;
}
}