Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-18 12:42:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-18 12:42:37 +0300
commit1cf0930e895b38d2e6991c9f62fa44fa9c1cc326 (patch)
treed04c19713fe13548907e696e1ea2734c99bdc424 /source/blender/windowmanager
parent2451a1951e22fd7761f7e39ededda0bd5cc2d875 (diff)
Fix manipulator resetting the cursor
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
index 1bb479774c2..da55db9db00 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
@@ -865,13 +865,14 @@ void wm_manipulatormap_highlight_set(
if (C && mpr->type->cursor_get) {
wmWindow *win = CTX_wm_window(C);
+ win->lastcursor = win->cursor;
WM_cursor_set(win, mpr->type->cursor_get(mpr));
}
}
else {
if (C) {
wmWindow *win = CTX_wm_window(C);
- WM_cursor_set(win, CURSOR_STD);
+ WM_cursor_set(win, win->lastcursor);
}
}