diff options
| author | Kai Mach <> | 2016-09-11 00:33:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-09-11 00:37:53 +0300 |
| commit | 56064b508b93ada8354af50596a2aa66f90dd79b (patch) | |
| tree | 37bf1466e4eb1f6569b70ad4a2c80142c6682664 /source/blender/windowmanager | |
| parent | 9fc1cfc4f1e61d5c4c929ead6736afa2d88f5969 (diff) | |
NDOF: allow view movement for modal border and circle select operators.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2167
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 0c137221856..7177244611e 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2299,6 +2299,11 @@ int WM_border_select_modal(bContext *C, wmOperator *op, const wmEvent *event) } } +#ifdef WITH_INPUT_NDOF + else if (event->type == NDOF_MOTION) { + return OPERATOR_PASS_THROUGH; + } +#endif // /* Allow view navigation??? */ // else { // return OPERATOR_PASS_THROUGH; @@ -2413,6 +2418,11 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_FINISHED; /* use finish or we don't get an undo */ } } +#ifdef WITH_INPUT_NDOF + else if (event->type == NDOF_MOTION) { + return OPERATOR_PASS_THROUGH; + } +#endif /* Allow view navigation??? */ /* note, this gives issues: 1) other modal ops run on top (border select), 2) middlemouse is used now 3) tablet/trackpad? */ // else { |