diff options
5 files changed, 14 insertions, 15 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index d05a95e5c49..6d67c02a49c 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -1460,8 +1460,7 @@ def km_graph_editor(params): ("graph.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, {"properties": [("mode", 'RIGHT'), ("extend", False)]}), *_template_items_select_actions(params, "graph.select_all"), - ("graph.select_box", {"type": 'B', "value": 'PRESS'}, - {"properties": [("axis_range", False)]}), + ("graph.select_box", {"type": 'B', "value": 'PRESS'}, None), ("graph.select_box", {"type": 'B', "value": 'PRESS', "alt": True}, {"properties": [("axis_range", True)]}), ("graph.select_box", {"type": params.select_tweak, "value": 'ANY'}, diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 2e853a287ea..c251d55714f 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -171,14 +171,10 @@ class GRAPH_MT_select(Menu): layout.separator() - props = layout.operator("graph.select_box") - props.axis_range = False - props.include_handles = False + layout.operator("graph.select_box") props = layout.operator("graph.select_box", text="Box Select (Axis Range)") props.axis_range = True - props.include_handles = False props = layout.operator("graph.select_box", text="Box Select (Include Handles)") - props.axis_range = False props.include_handles = True layout.operator("graph.select_circle") diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 72583519800..1cb3829708a 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -404,7 +404,7 @@ class SEQUENCER_MT_select(Menu): layout.separator() layout.operator("sequencer.select_box", text="Box Select") - props = layout.operator("sequencer.select_box", text="Box Select (Handles)") + props = layout.operator("sequencer.select_box", text="Box Select (Include Handles)") props.include_handles = True layout.separator() diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 9c1d63ef68a..a3f7496d13b 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -724,13 +724,17 @@ void GRAPH_OT_select_box(wmOperatorType *ot) /* properties */ ot->prop = RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", ""); - RNA_def_boolean(ot->srna, - "include_handles", - true, - "Include Handles", - "Are handles tested individually against the selection criteria"); + RNA_def_property_flag(ot->prop, PROP_SKIP_SAVE); + + PropertyRNA *prop; + prop = RNA_def_boolean(ot->srna, + "include_handles", + true, + "Include Handles", + "Are handles tested individually against the selection criteria"); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); - PropertyRNA *prop = RNA_def_boolean( + prop = RNA_def_boolean( ot->srna, "tweak", 0, "Tweak", "Operator has been activated using a tweak event"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index f63081c838b..a6f9ffc3b19 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -1136,7 +1136,7 @@ void SEQUENCER_OT_select_box(wmOperatorType *ot) ot->srna, "tweak", 0, "Tweak", "Operator has been activated using a tweak event"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); prop = RNA_def_boolean( - ot->srna, "include_handles", 0, "Select Handles", "Select the strips' handles"); + ot->srna, "include_handles", 0, "Select Handles", "Select the strips and their handles"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); } |