diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-05 14:26:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-05 14:26:45 +0300 |
| commit | 8d8d113b7379b96d8cd9440f4e1f87524a418fef (patch) | |
| tree | ecc4ac8f59c846918fd280db82ee87dc15c92e4d /source/blender/editors/space_action/action_select.c | |
| parent | 0ae6747300a74daf14482f9ca89caffa9e503454 (diff) | |
Tool System: use set/add/subtract for all circle select operators
This applies changes from the 3D view circle select to other operators.
Diffstat (limited to 'source/blender/editors/space_action/action_select.c')
| -rw-r--r-- | source/blender/editors/space_action/action_select.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index c7b62af9d0b..0d9c3808b55 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -610,8 +610,6 @@ void ACTION_OT_select_lasso(wmOperatorType *ot) static int action_circle_select_exec(bContext *C, wmOperator *op) { bAnimContext ac; - const bool select = !RNA_boolean_get(op->ptr, "deselect"); - const short selectmode = select ? SELECT_ADD : SELECT_SUBTRACT; KeyframeEdit_CircleData data = {0}; rctf rect_fl; @@ -624,6 +622,13 @@ static int action_circle_select_exec(bContext *C, wmOperator *op) if (ANIM_animdata_get_context(C, &ac) == 0) return OPERATOR_CANCELLED; + const eSelectOp sel_op = ED_select_op_modal( + RNA_enum_get(op->ptr, "mode"), WM_gesture_is_modal_first(op->customdata)); + const short selectmode = (sel_op != SEL_OP_SUB) ? SELECT_ADD : SELECT_SUBTRACT; + if (SEL_OP_USE_PRE_DESELECT(sel_op)) { + deselect_action_keys(&ac, 0, SELECT_SUBTRACT); + } + data.mval[0] = x; data.mval[1] = y; data.radius_squared = radius * radius; @@ -659,7 +664,8 @@ void ACTION_OT_select_circle(wmOperatorType *ot) ot->flag = OPTYPE_UNDO; /* properties */ - WM_operator_properties_gesture_circle_select(ot); + WM_operator_properties_gesture_circle(ot); + WM_operator_properties_select_operation_simple(ot); } /* ******************** Column Select Operator **************************** */ |