diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-07 12:33:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-07 12:34:10 +0300 |
| commit | 219e2f976d077c16c28d72a2f6763c01230c5bf8 (patch) | |
| tree | ba40e7f79947dd11cae4a08ed813f920c00fbfd7 /source/blender/editors/mask/mask_select.c | |
| parent | e52e0c83d717b46afcce36b23e3f6b32f5cb535b (diff) | |
Tool System: use set/add/subtract for all box select operators
Diffstat (limited to 'source/blender/editors/mask/mask_select.c')
| -rw-r--r-- | source/blender/editors/mask/mask_select.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index 2cab5d673ed..9bda6f7a92d 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -402,8 +402,13 @@ static int box_select_exec(bContext *C, wmOperator *op) rcti rect; rctf rectf; bool changed = false; - const bool select = !RNA_boolean_get(op->ptr, "deselect"); - const bool extend = RNA_boolean_get(op->ptr, "extend"); + + const eSelectOp sel_op = RNA_enum_get(op->ptr, "mode"); + const bool select = (sel_op != SEL_OP_SUB); + if (SEL_OP_USE_PRE_DESELECT(sel_op)) { + ED_mask_select_toggle_all(mask, SEL_DESELECT); + changed = true; + } /* get rectangle from operator */ WM_operator_properties_border_to_rcti(op, &rect); @@ -428,17 +433,11 @@ static int box_select_exec(bContext *C, wmOperator *op) /* TODO: handles? */ /* TODO: uw? */ - if (BLI_rctf_isect_pt_v(&rectf, point_deform->bezt.vec[1])) { BKE_mask_point_select_set(point, select); BKE_mask_point_select_set_handle(point, MASK_WHICH_HANDLE_BOTH, select); + changed = true; } - else if (!extend) { - BKE_mask_point_select_set(point, false); - BKE_mask_point_select_set_handle(point, MASK_WHICH_HANDLE_BOTH, false); - } - - changed = true; } } } @@ -471,7 +470,8 @@ void MASK_OT_select_box(wmOperatorType *ot) ot->flag = OPTYPE_UNDO; /* properties */ - WM_operator_properties_gesture_box_select(ot); + WM_operator_properties_gesture_box(ot); + WM_operator_properties_select_operation_simple(ot); } static bool do_lasso_select_mask(bContext *C, const int mcords[][2], short moves, bool select, bool extend) |