[Bf-blender-cvs] [1cf0930e895] blender2.8: Fix manipulator resetting the cursor

[Campbell Barton]

Commit: 1cf0930e895b38d2e6991c9f62fa44fa9c1cc326
Author: Campbell Barton
Date:   Fri May 18 11:42:37 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1cf0930e895b38d2e6991c9f62fa44fa9c1cc326

Fix manipulator resetting the cursor

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

M	source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c

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

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);
 			}
 		}