diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-16 14:28:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-16 14:28:24 +0300 |
| commit | a2758152e2dccb3b016e13a3de2d9e58587866ab (patch) | |
| tree | d872a7ae82e682012758c12eb5d8c8e63828c00d /source/blender/windowmanager/WM_types.h | |
| parent | 14af3e485f1207e8f4ddb6991b22e1ba2f937c45 (diff) | |
| parent | 870b4b673511094cf0beaeaf07305407ccdda47a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/WM_types.h')
| -rw-r--r-- | source/blender/windowmanager/WM_types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 0e259c5fd8a..f48a2cef1e6 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -418,10 +418,13 @@ typedef struct wmGesture { int swinid; /* initial subwindow id where it started */ int points; /* optional, amount of points stored */ int points_alloc; /* optional, maximum amount of points stored */ + int modal_state; /* For modal operators which may be running idle, waiting for an event to activate the gesture. * Typically this is set when the user is click-dragging the gesture (border and circle select for eg). */ uint is_active : 1; + /* Use for gestures that support both immediate or delayed activation. */ + uint wait_for_input : 1; void *customdata; /* customdata for border is a recti */ |