diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-24 15:23:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-24 15:23:32 +0300 |
| commit | 39aea50155dc623db48f900d2b9644b607425b6c (patch) | |
| tree | 3bb0411d569ffd9a5963ff05569e57a327784609 /source/blender/editors/transform/transform_input.c | |
| parent | c1361d2651222fb52839df038e92c18e1fdefc4e (diff) | |
Fix T55178: Cursor fails to restore on cancel
574c0fe38f332bd97c588029c0075ecba1fe19cd caused complications
restoring the cursor.
Use WM_cursor_modal_set/restore which is intended for operator use,
calling ED_region_cursor_set after an operator runs isn't reliable.
Diffstat (limited to 'source/blender/editors/transform/transform_input.c')
| -rw-r--r-- | source/blender/editors/transform/transform_input.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index 2004bba4f09..270ef08be50 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -351,7 +351,8 @@ void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode) case HLP_NONE: /* INPUT_VECTOR, INPUT_CUSTOM_RATIO, INPUT_CUSTOM_RATIO_FLIP */ if (t->flag & T_MODAL) { - WM_cursor_set(win, BC_NSEW_SCROLLCURSOR); + t->flag |= T_MODAL_CURSOR_SET; + WM_cursor_modal_set(win, BC_NSEW_SCROLLCURSOR); } break; case HLP_SPRING: @@ -360,7 +361,8 @@ void initMouseInputMode(TransInfo *t, MouseInput *mi, MouseInputMode mode) case HLP_HARROW: case HLP_VARROW: if (t->flag & T_MODAL) { - WM_cursor_set(win, CURSOR_NONE); + t->flag |= T_MODAL_CURSOR_SET; + WM_cursor_modal_set(win, CURSOR_NONE); } break; default: |