From 39aea50155dc623db48f900d2b9644b607425b6c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 24 May 2018 14:23:32 +0200 Subject: 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. --- source/blender/editors/transform/transform.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/editors/transform/transform.h') diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 2cf66794709..a8a71c95e37 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -601,6 +601,8 @@ typedef struct TransInfo { /** #TransInfo.center has been set, don't change it. */ #define T_OVERRIDE_CENTER (1 << 25) +#define T_MODAL_CURSOR_SET (1 << 26) + /* TransInfo->modifiers */ #define MOD_CONSTRAINT_SELECT 0x01 #define MOD_PRECISION 0x02 -- cgit v1.2.3 From a3a069f4935f72225ad7a0dc23bfc36b9fbed079 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 25 May 2018 19:43:23 +0200 Subject: Tool System: cursor tool now transforms on drag --- source/blender/editors/transform/transform.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/editors/transform/transform.h') diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index a8a71c95e37..b9f42a0d9fc 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -557,6 +557,8 @@ typedef struct TransInfo { #define T_TEXTURE (1 << 3) /* transforming the camera while in camera view */ #define T_CAMERA (1 << 4) + /* transforming the 3D cursor. */ +#define T_CURSOR (1 << 5) // trans on points, having no rotation/scale #define T_POINTS (1 << 6) /** -- cgit v1.2.3