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/space_clip | |
| parent | e52e0c83d717b46afcce36b23e3f6b32f5cb535b (diff) | |
Tool System: use set/add/subtract for all box select operators
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/tracking_select.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index abf89e86cdb..e25bf22db91 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -443,8 +443,12 @@ static int box_select_exec(bContext *C, wmOperator *op) ED_clip_point_stable_pos(sc, ar, rect.xmin, rect.ymin, &rectf.xmin, &rectf.ymin); ED_clip_point_stable_pos(sc, ar, rect.xmax, rect.ymax, &rectf.xmax, &rectf.ymax); - 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_clip_select_all(sc, SEL_DESELECT, NULL); + changed = true; + } /* do actual selection */ track = tracksbase->first; @@ -461,10 +465,6 @@ static int box_select_exec(bContext *C, wmOperator *op) BKE_tracking_track_flag_clear(track, TRACK_AREA_ALL, SELECT); } } - else if (!extend) { - BKE_tracking_track_flag_clear(track, TRACK_AREA_ALL, SELECT); - } - changed = true; } } @@ -490,11 +490,7 @@ static int box_select_exec(bContext *C, wmOperator *op) plane_track->flag &= ~SELECT; } } - else if (!extend) { - plane_track->flag &= ~SELECT; - } } - changed = true; } } @@ -528,7 +524,8 @@ void CLIP_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); } /********************** lasso select operator *********************/ |