diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-14 03:28:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-14 18:48:55 +0300 |
| commit | e88e80a6a0c8976ac2d245c274ca5a0388736743 (patch) | |
| tree | 870bc13538dfb5b55d4063cdab0aa611573dde60 /source/blender/windowmanager/intern/wm_gesture_ops.c | |
| parent | d92d310b158d4b946aa8b811248b25e7a39f7a1a (diff) | |
3D View boarder/lasso select tool options
Add tool options to control how select operates (add/sub/set/and/xor).
Note: edit mode armature select still needs to support all options,
this is complicated by how it handles partial end-point selection.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_gesture_ops.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_gesture_ops.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture_ops.c b/source/blender/windowmanager/intern/wm_gesture_ops.c index 01184f47920..a4d811bf91b 100644 --- a/source/blender/windowmanager/intern/wm_gesture_ops.c +++ b/source/blender/windowmanager/intern/wm_gesture_ops.c @@ -49,6 +49,7 @@ #include "wm_event_system.h" #include "ED_screen.h" +#include "ED_select_utils.h" #include "RNA_access.h" #include "RNA_define.h" @@ -86,13 +87,22 @@ static void gesture_modal_state_to_operator(wmOperator *op, int modal_state) case GESTURE_MODAL_SELECT: case GESTURE_MODAL_DESELECT: if ((prop = RNA_struct_find_property(op->ptr, "deselect"))) { - RNA_property_boolean_set(op->ptr, prop, (modal_state == GESTURE_MODAL_DESELECT)); + if (!RNA_property_is_set(op->ptr, prop)) { + RNA_property_boolean_set(op->ptr, prop, (modal_state == GESTURE_MODAL_DESELECT)); + } + } + if ((prop = RNA_struct_find_property(op->ptr, "mode"))) { + if (!RNA_property_is_set(op->ptr, prop)) { + RNA_property_enum_set(op->ptr, prop, (modal_state == GESTURE_MODAL_DESELECT) ? SEL_OP_SUB : SEL_OP_ADD); + } } break; case GESTURE_MODAL_IN: case GESTURE_MODAL_OUT: if ((prop = RNA_struct_find_property(op->ptr, "zoom_out"))) { - RNA_property_boolean_set(op->ptr, prop, (modal_state == GESTURE_MODAL_OUT)); + if (!RNA_property_is_set(op->ptr, prop)) { + RNA_property_boolean_set(op->ptr, prop, (modal_state == GESTURE_MODAL_OUT)); + } } break; } @@ -107,6 +117,11 @@ static int gesture_modal_state_from_operator(wmOperator *op) return RNA_property_boolean_get(op->ptr, prop) ? GESTURE_MODAL_DESELECT : GESTURE_MODAL_SELECT; } } + if ((prop = RNA_struct_find_property(op->ptr, "mode"))) { + if (RNA_property_is_set(op->ptr, prop)) { + return RNA_property_enum_get(op->ptr, prop) == SEL_OP_SUB ? GESTURE_MODAL_DESELECT : GESTURE_MODAL_SELECT; + } + } if ((prop = RNA_struct_find_property(op->ptr, "zoom_out"))) { if (RNA_property_is_set(op->ptr, prop)) { return RNA_property_boolean_get(op->ptr, prop) ? GESTURE_MODAL_OUT : GESTURE_MODAL_IN; |