[Bf-blender-cvs] [56064b5] master: NDOF: allow view movement for modal border and circle select operators.
Kai Mach
noreply at git.blender.org
Sat Sep 10 23:48:35 CEST 2016
Commit: 56064b508b93ada8354af50596a2aa66f90dd79b
Author: Kai Mach
Date: Sat Sep 10 23:33:26 2016 +0200
Branches: master
https://developer.blender.org/rB56064b508b93ada8354af50596a2aa66f90dd79b
NDOF: allow view movement for modal border and circle select operators.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2167
===================================================================
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 0c13722..7177244 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 {
More information about the Bf-blender-cvs
mailing list