diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-07 15:41:32 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-07 15:45:58 +0300 |
commit | 190159589840547c9b58b8d639a76313cee9478b (patch) | |
tree | 931089016e76532c63129387aec87e80cd83500f /source/blender/windowmanager | |
parent | a280867ac2ed924e25f72d020c004b83044a1f51 (diff) |
Tool System: use set/add/subtract for all lasso select operators
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operator_props.c | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 5b5904c6d73..3037e0fbaae 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -371,9 +371,7 @@ void WM_operator_properties_gesture_box_ex(struct wmOperatorType *ot, boo void WM_operator_properties_gesture_box(struct wmOperatorType *ot); void WM_operator_properties_gesture_box_select(struct wmOperatorType *ot); void WM_operator_properties_gesture_box_zoom(struct wmOperatorType *ot); -void WM_operator_properties_gesture_lasso_ex(struct wmOperatorType *ot, bool deselect, bool extend); void WM_operator_properties_gesture_lasso(struct wmOperatorType *ot); -void WM_operator_properties_gesture_lasso_select(struct wmOperatorType *ot); void WM_operator_properties_gesture_straightline(struct wmOperatorType *ot, int cursor); void WM_operator_properties_gesture_circle(struct wmOperatorType *ot); void WM_operator_properties_mouse_select(struct wmOperatorType *ot); diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c index 5700e4fc0bc..820123621f7 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.c +++ b/source/blender/windowmanager/intern/wm_operator_props.c @@ -303,28 +303,11 @@ void WM_operator_properties_gesture_box_zoom(wmOperatorType *ot) /** * Use with #WM_gesture_lasso_invoke */ -void WM_operator_properties_gesture_lasso_ex(wmOperatorType *ot, bool deselect, bool extend) +void WM_operator_properties_gesture_lasso(wmOperatorType *ot) { PropertyRNA *prop; prop = RNA_def_collection_runtime(ot->srna, "path", &RNA_OperatorMousePath, "Path", ""); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); - - if (deselect) { - RNA_def_boolean(ot->srna, "deselect", false, "Deselect", "Deselect rather than select items"); - } - if (extend) { - RNA_def_boolean(ot->srna, "extend", true, "Extend", "Extend selection instead of deselecting everything first"); - } -} - -void WM_operator_properties_gesture_lasso(wmOperatorType *ot) -{ - WM_operator_properties_gesture_lasso_ex(ot, false, false); -} - -void WM_operator_properties_gesture_lasso_select(wmOperatorType *ot) -{ - WM_operator_properties_gesture_lasso_ex(ot, true, true); } /** |