From 9586c23d751ddacc638eab82024decbeac0b18c7 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 29 Apr 2019 11:33:50 +0200 Subject: Select: support 'diselect on nothing' for masks. Also moved that operator option from 3d-view op to generic WM_operator_properties_mouse_select() helper, and renamed its label (since 'Deselect' is already in use). Part of T57918. --- source/blender/editors/mask/mask_select.c | 10 ++++++++++ source/blender/editors/space_view3d/view3d_select.c | 3 --- source/blender/windowmanager/intern/wm_operator_props.c | 7 +++++++ 3 files changed, 17 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c index 00699c8ffe0..a592f39d24b 100644 --- a/source/blender/editors/mask/mask_select.c +++ b/source/blender/editors/mask/mask_select.c @@ -262,6 +262,7 @@ static int select_exec(bContext *C, wmOperator *op) bool extend = RNA_boolean_get(op->ptr, "extend"); bool deselect = RNA_boolean_get(op->ptr, "deselect"); bool toggle = RNA_boolean_get(op->ptr, "toggle"); + const bool deselect_all = RNA_boolean_get(op->ptr, "deselect_all"); eMaskWhichHandle which_handle; const float threshold = 19; @@ -366,6 +367,15 @@ static int select_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask); + return OPERATOR_FINISHED; + } + else if (deselect_all) { + ED_mask_select_toggle_all(mask, SEL_DESELECT); + + ED_mask_select_flush_all(mask); + + WM_event_add_notifier(C, NC_MASK | ND_SELECT, mask); + return OPERATOR_FINISHED; } } diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 443c7ab9368..bac24b80c3e 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -2251,9 +2251,6 @@ void VIEW3D_OT_select(wmOperatorType *ot) /* properties */ WM_operator_properties_mouse_select(ot); - prop = RNA_def_boolean( - ot->srna, "deselect_all", 0, "Deselect", "Deselect all when nothing under the cursor"); - RNA_def_property_flag(prop, PROP_SKIP_SAVE); prop = RNA_def_boolean( ot->srna, diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c index 39594a66e4e..5fbf82f68af 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.c +++ b/source/blender/windowmanager/intern/wm_operator_props.c @@ -449,6 +449,13 @@ void WM_operator_properties_mouse_select(wmOperatorType *ot) RNA_def_property_flag(prop, PROP_SKIP_SAVE); prop = RNA_def_boolean(ot->srna, "toggle", false, "Toggle Selection", "Toggle the selection"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); + + prop = RNA_def_boolean(ot->srna, + "deselect_all", + 0, + "Deselect On Nothing", + "Deselect all when nothing under the cursor"); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } /** -- cgit v1.2.3