diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2018-04-23 01:42:17 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2018-04-23 01:59:01 +0300 |
| commit | 574c0fe38f332bd97c588029c0075ecba1fe19cd (patch) | |
| tree | 9c234ba62e515d24334fa06aa7f97b0d1d0a8e33 /source/blender/windowmanager | |
| parent | 93adbf8195f0960fc203e8d1a3851efd38526d21 (diff) | |
Manipulators/Tools: always draw a cursor while interacting
Cursor can be a system one or drawn with OpenGL.
Before, dragging the transform manipulator would hide the cursor and reset it to the initial positon.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 95ead3befdc..69537aa41c9 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1903,7 +1903,10 @@ static int wm_handler_operator_call(bContext *C, ListBase *handlers, wmEventHand /* remove modal handler, operator itself should have been canceled and freed */ if (retval & (OPERATOR_CANCELLED | OPERATOR_FINISHED)) { - WM_cursor_grab_disable(CTX_wm_window(C), NULL); + /* set cursor back to the default for the region */ + wmWindow *win = CTX_wm_window(C); + WM_cursor_grab_disable(win, NULL); + ED_region_cursor_set(win, CTX_wm_area(C), CTX_wm_region(C)); BLI_remlink(handlers, handler); wm_event_free_handler(handler); |