diff options
| -rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 135 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_select.c | 13 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/clip_graph_ops.c | 13 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/tracking_select.c | 11 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/graph_edit.c | 13 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_select.cc | 12 |
6 files changed, 93 insertions, 104 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 0e5a5b84e81..6a9306c2eab 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -796,11 +796,11 @@ def km_outliner(params): ("outliner.item_rename", {"type": 'F2', "value": 'PRESS'}, {"properties": [("use_active", True)]}), ("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK'}, - {"properties": [("extend", False), ("deselect_all", not params.legacy)]}), + {"properties": [("deselect_all", not params.legacy)]}), ("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True}, {"properties": [("extend", True), ("deselect_all", not params.legacy)]}), ("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "shift": True}, - {"properties": [("extend", False), ("extend_range", True), ("deselect_all", not params.legacy)]}), + {"properties": [("extend_range", True), ("deselect_all", not params.legacy)]}), ("outliner.item_activate", {"type": 'LEFTMOUSE', "value": 'CLICK', "ctrl": True, "shift": True}, {"properties": [("extend", True), ("extend_range", True), ("deselect_all", not params.legacy)]}), ("outliner.select_box", {"type": 'B', "value": 'PRESS'}, None), @@ -884,15 +884,13 @@ def km_uv_editor(params): *_template_items_uv_select_mode(params), ("uv.mark_seam", {"type": 'E', "value": 'PRESS', "ctrl": True}, None), ("uv.select", {"type": params.select_mouse, "value": params.select_mouse_value}, - {"properties": [("extend", False), ("deselect_all", not params.legacy)]}), + {"properties": [("deselect_all", not params.legacy)]}), ("uv.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True}, {"properties": [("extend", True)]}), - ("uv.select_loop", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True}, - {"properties": [("extend", False)]}), + ("uv.select_loop", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True}, None), ("uv.select_loop", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "alt": True}, {"properties": [("extend", True)]}), - ("uv.select_edge_ring", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "alt": True}, - {"properties": [("extend", False)]}), + ("uv.select_edge_ring", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "alt": True}, None), ("uv.select_edge_ring", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "shift": True, "alt": True}, {"properties": [("extend", True)]}), ("uv.shortest_path_pick", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True}, @@ -913,7 +911,7 @@ def km_uv_editor(params): ("uv.select_linked_pick", {"type": 'L', "value": 'PRESS'}, {"properties": [("extend", True), ("deselect", False)]}), ("uv.select_linked_pick", {"type": 'L', "value": 'PRESS', "shift": True}, - {"properties": [("extend", False), ("deselect", True)]}), + {"properties": [("deselect", True)]}), ("uv.select_more", {"type": 'NUMPAD_PLUS', "value": 'PRESS', "ctrl": True, "repeat": True}, None), ("uv.select_less", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "ctrl": True, "repeat": True}, None), *_template_items_select_actions(params, "uv.select_all"), @@ -957,8 +955,7 @@ def km_uv_editor(params): # Fallback for MMB emulation if params.use_mouse_emulate_3_button and params.select_mouse == 'LEFTMOUSE': items.extend([ - ("uv.select_loop", {"type": params.select_mouse, "value": 'DOUBLE_CLICK'}, - {"properties": [("extend", False)]}), + ("uv.select_loop", {"type": params.select_mouse, "value": 'DOUBLE_CLICK'}, None), ("uv.select_loop", {"type": params.select_mouse, "value": 'DOUBLE_CLICK', "alt": True}, {"properties": [("extend", True)]}), ]) @@ -1354,9 +1351,7 @@ def km_mask_editing(params): # click select keymap it's fine to have the context menu instead. items.extend([ ("mask.select", {"type": 'RIGHTMOUSE', "value": 'PRESS'}, - {"properties": [ - ("extend", False), ("deselect", False), ("toggle", False), - ("deselect_all", not params.legacy)]}), + {"properties": [("deselect_all", not params.legacy)]}), ("transform.translate", {"type": 'EVT_TWEAK_R', "value": 'ANY'}, None), ]) @@ -1370,7 +1365,7 @@ def km_mask_editing(params): ("mask.delete", {"type": 'X', "value": 'PRESS'}, None), ("mask.delete", {"type": 'DEL', "value": 'PRESS'}, None), ("mask.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, - {"properties": [("extend", False), ("deselect", False), ("toggle", True)]}), + {"properties": [("toggle", True)]}), *_template_items_select_actions(params, "mask.select_all"), ("mask.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None), ("mask.select_linked_pick", {"type": 'L', "value": 'PRESS'}, @@ -1390,8 +1385,7 @@ def km_mask_editing(params): {"properties": [("unselected", False)]}), ("mask.hide_view_set", {"type": 'H', "value": 'PRESS', "shift": True}, {"properties": [("unselected", True)]}), - ("clip.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True}, - {"properties": [("extend", False)]}), + ("clip.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True}, None), ("mask.cyclic_toggle", {"type": 'C', "value": 'PRESS', "alt": True}, None), ("mask.slide_point", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None), ("mask.slide_spline_curvature", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None), @@ -1446,7 +1440,7 @@ def km_markers(params): ("marker.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), ("marker.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True}, - {"properties": [("extend", False), ("camera", True)]}), + {"properties": [("camera", True)]}), ("marker.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True}, {"properties": [("extend", True), ("camera", True)]}), ("marker.select_box", {"type": params.select_tweak, "value": 'ANY'}, @@ -1531,29 +1525,27 @@ def km_graph_editor(params): ("wm.context_toggle", {"type": 'H', "value": 'PRESS', "ctrl": True}, {"properties": [("data_path", 'space_data.show_handles')]}), ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS'}, - {"properties": [ - ("extend", False), ("deselect_all", not params.legacy), - ("column", False), ("curves", False)]}), + {"properties": [("deselect_all", not params.legacy)]}), ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "alt": True}, - {"properties": [("extend", False), ("column", True), ("curves", False)]}), + {"properties": [("column", True)]}), ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, - {"properties": [("extend", True), ("column", False), ("curves", False)]}), + {"properties": [("extend", True)]}), ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True}, - {"properties": [("extend", True), ("column", True), ("curves", False)]}), + {"properties": [("extend", True), ("column", True)]}), ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "alt": True}, - {"properties": [("extend", False), ("column", False), ("curves", True)]}), + {"properties": [("curves", True)]}), ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, - {"properties": [("extend", True), ("column", False), ("curves", True)]}), + {"properties": [("extend", True), ("curves", True)]}), ("graph.select_leftright", {"type": params.select_mouse, "value": 'PRESS' if params.legacy else 'CLICK', "ctrl": True}, - {"properties": [("mode", 'CHECK'), ("extend", False)]}), + {"properties": [("mode", 'CHECK')]}), ("graph.select_leftright", {"type": params.select_mouse, "value": 'PRESS' if params.legacy else 'CLICK', "ctrl": True, "shift": True}, {"properties": [("mode", 'CHECK'), ("extend", True)]}), ("graph.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'}, - {"properties": [("mode", 'LEFT'), ("extend", False)]}), + {"properties": [("mode", 'LEFT')]}), ("graph.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, - {"properties": [("mode", 'RIGHT'), ("extend", False)]}), + {"properties": [("mode", 'RIGHT')]}), *_template_items_select_actions(params, "graph.select_all"), ("graph.select_box", {"type": 'B', "value": 'PRESS'}, None), ("graph.select_box", {"type": 'B', "value": 'PRESS', "alt": True}, @@ -1597,8 +1589,7 @@ def km_graph_editor(params): ("graph.delete", {"type": 'DEL', "value": 'PRESS'}, {"properties": [("confirm", False)]}), ("graph.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None), ("graph.keyframe_insert", {"type": 'I', "value": 'PRESS'}, None), - ("graph.click_insert", {"type": params.action_mouse, "value": 'CLICK', "ctrl": True}, - {"properties": [("extend", False)]}), + ("graph.click_insert", {"type": params.action_mouse, "value": 'CLICK', "ctrl": True}, None), ("graph.click_insert", {"type": params.action_mouse, "value": 'CLICK', "shift": True, "ctrl": True}, {"properties": [("extend", True)]}), ("graph.copy", {"type": 'C', "value": 'PRESS', "ctrl": True}, None), @@ -1804,13 +1795,10 @@ def km_node_editor(params): def node_select_ops(select_mouse): return [ ("node.select", {"type": select_mouse, "value": 'PRESS'}, - {"properties": [("extend", False), ("deselect_all", True)]}), - ("node.select", {"type": select_mouse, "value": 'PRESS', "ctrl": True}, - {"properties": [("extend", False)]}), - ("node.select", {"type": select_mouse, "value": 'PRESS', "alt": True}, - {"properties": [("extend", False)]}), - ("node.select", {"type": select_mouse, "value": 'PRESS', "ctrl": True, "alt": True}, - {"properties": [("extend", False)]}), + {"properties": [("deselect_all", True)]}), + ("node.select", {"type": select_mouse, "value": 'PRESS', "ctrl": True}, None), + ("node.select", {"type": select_mouse, "value": 'PRESS', "alt": True}, None), + ("node.select", {"type": select_mouse, "value": 'PRESS', "ctrl": True, "alt": True}, None), ("node.select", {"type": select_mouse, "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), ("node.select", {"type": select_mouse, "value": 'PRESS', "shift": True, "ctrl": True}, @@ -1832,7 +1820,7 @@ def km_node_editor(params): items.extend(node_select_ops('RIGHTMOUSE')) items.extend([ ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS'}, - {"properties": [("extend", False), ("deselect_all", False)]}), + {"properties": [("deselect_all", False)]}), ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), ]) @@ -1887,8 +1875,7 @@ def km_node_editor(params): *_template_items_select_actions(params, "node.select_all"), ("node.select_linked_to", {"type": 'L', "value": 'PRESS', "shift": True}, None), ("node.select_linked_from", {"type": 'L', "value": 'PRESS'}, None), - ("node.select_grouped", {"type": 'G', "value": 'PRESS', "shift": True}, - {"properties": [("extend", False)]}), + ("node.select_grouped", {"type": 'G', "value": 'PRESS', "shift": True}, None), ("node.select_grouped", {"type": 'G', "value": 'PRESS', "shift": True, "ctrl": True}, {"properties": [("extend", True)]}), ("node.select_same_type_step", {"type": 'RIGHT_BRACKET', "value": 'PRESS', "shift": True}, @@ -2131,29 +2118,27 @@ def km_dopesheet(params): items.extend([ ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS'}, - {"properties": [ - ("extend", False), ("deselect_all", not params.legacy), - ("column", False), ("channel", False)]}), + {"properties": [("deselect_all", not params.legacy)]}), ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "alt": True}, - {"properties": [("extend", False), ("column", True), ("channel", False)]}), + {"properties": [("column", True)]}), ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, - {"properties": [("extend", True), ("column", False), ("channel", False)]}), + {"properties": [("extend", True)]}), ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True}, - {"properties": [("extend", True), ("column", True), ("channel", False)]}), + {"properties": [("extend", True), ("column", True)]}), ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "alt": True}, - {"properties": [("extend", False), ("column", False), ("channel", True)]}), + {"properties": [("channel", True)]}), ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, - {"properties": [("extend", True), ("column", False), ("channel", True)]}), + {"properties": [("extend", True), ("channel", True)]}), ("action.select_leftright", {"type": params.select_mouse, "value": 'PRESS' if params.legacy else 'CLICK', "ctrl": True}, - {"properties": [("mode", 'CHECK'), ("extend", False)]}), + {"properties": [("mode", 'CHECK')]}), ("action.select_leftright", {"type": params.select_mouse, "value": 'PRESS' if params.legacy else 'CLICK', "ctrl": True, "shift": True}, {"properties": [("mode", 'CHECK'), ("extend", True)]}), ("action.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'}, - {"properties": [("mode", 'LEFT'), ("extend", False)]}), + {"properties": [("mode", 'LEFT')]}), ("action.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, - {"properties": [("mode", 'RIGHT'), ("extend", False)]}), + {"properties": [("mode", 'RIGHT')]}), *_template_items_select_actions(params, "action.select_all"), ("action.select_box", {"type": 'B', "value": 'PRESS'}, {"properties": [("axis_range", False)]}), @@ -2264,8 +2249,7 @@ def km_nla_channels(params): ) items.extend([ - ("nla.channels_click", {"type": 'LEFTMOUSE', "value": 'PRESS'}, - {"properties": [("extend", False)]}), + ("nla.channels_click", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None), ("nla.channels_click", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), ("nla.tracks_add", {"type": 'A', "value": 'PRESS', "shift": True}, @@ -2290,19 +2274,19 @@ def km_nla_editor(params): items.extend([ ("nla.click_select", {"type": params.select_mouse, "value": 'PRESS'}, - {"properties": [("extend", False), ("deselect_all", not params.legacy)]}), + {"properties": [("deselect_all", not params.legacy)]}), ("nla.click_select", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), ("nla.select_leftright", {"type": params.select_mouse, "value": 'PRESS' if params.legacy else 'CLICK', "ctrl": True}, - {"properties": [("mode", 'CHECK'), ("extend", False)]}), + {"properties": [("mode", 'CHECK')]}), ("nla.select_leftright", {"type": params.select_mouse, "value": 'PRESS' if params.legacy else 'CLICK', "ctrl": True, "shift": True}, {"properties": [("mode", 'CHECK'), ("extend", True)]}), ("nla.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'}, - {"properties": [("mode", 'LEFT'), ("extend", False)]}), + {"properties": [("mode", 'LEFT')]}), ("nla.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, - {"properties": [("mode", 'RIGHT'), ("extend", False)]}), + {"properties": [("mode", 'RIGHT')]}), *_template_items_select_actions(params, "nla.select_all"), ("nla.select_box", {"type": 'B', "value": 'PRESS'}, {"properties": [("axis_range", False)]}), @@ -2638,8 +2622,7 @@ def km_sequencer(params): {"properties": [("side_of_frame", True), ("linked_time", True), ("extend", True)]}), ("sequencer.select_more", {"type": 'NUMPAD_PLUS', "value": 'PRESS', "ctrl": True, "repeat": True}, None), ("sequencer.select_less", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "ctrl": True, "repeat": True}, None), - ("sequencer.select_linked_pick", {"type": 'L', "value": 'PRESS'}, - {"properties": [("extend", False)]}), + ("sequencer.select_linked_pick", {"type": 'L', "value": 'PRESS'}, None), ("sequencer.select_linked_pick", {"type": 'L', "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), ("sequencer.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None), @@ -2862,7 +2845,7 @@ def km_clip_editor(params): {"properties": [("position", 'PATHSTART')]}), ("clip.change_frame", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None), ("clip.select", {"type": params.select_mouse, "value": 'PRESS'}, - {"properties": [("extend", False), ("deselect_all", not params.legacy)]}), + {"properties": [("deselect_all", not params.legacy)]}), ("clip.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), *_template_items_select_actions(params, "clip.select_all"), @@ -2948,8 +2931,7 @@ def km_clip_graph_editor(params): ) items.extend([ - ("clip.graph_select", {"type": params.select_mouse, "value": 'PRESS'}, - {"properties": [("extend", False)]}), + ("clip.graph_select", {"type": params.select_mouse, "value": 'PRESS'}, None), ("clip.graph_select", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), *_template_items_select_actions(params, "clip.graph_select_all_markers"), @@ -4241,8 +4223,7 @@ def km_paint_curve(params): items.extend([ ("paintcurve.add_point_slide", {"type": params.action_mouse, "value": 'PRESS', "ctrl": True}, None), - ("paintcurve.select", {"type": params.select_mouse, "value": 'PRESS'}, - {"properties": [("extend", False)]}), + ("paintcurve.select", {"type": params.select_mouse, "value": 'PRESS'}, None), ("paintcurve.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), ("paintcurve.slide", {"type": params.action_mouse, "value": 'PRESS'}, @@ -4664,15 +4645,13 @@ def km_mesh(params): # Selection modes. *_template_items_editmode_mesh_select_mode(params), # Loop Select with alt. Double click in case MMB emulation is on (below). - ("mesh.loop_select", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True}, - {"properties": [("extend", False), ("deselect", False), ("toggle", False)]}), + ("mesh.loop_select", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True}, None), ("mesh.loop_select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "alt": True}, - {"properties": [("extend", False), ("deselect", False), ("toggle", True)]}), + {"properties": [("toggle", True)]}), # Selection - ("mesh.edgering_select", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "alt": True}, - {"properties": [("extend", False), ("deselect", False), ("toggle", False)]}), + ("mesh.edgering_select", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "alt": True}, None), ("mesh.edgering_select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True, "alt": True}, - {"properties": [("extend", False), ("deselect", False), ("toggle", True)]}), + {"properties": [("toggle", True)]}), ("mesh.shortest_path_pick", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True}, {"properties": [("use_fill", False)]}), ("mesh.shortest_path_pick", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True}, @@ -4754,16 +4733,14 @@ def km_mesh(params): if params.use_mouse_emulate_3_button and params.select_mouse == 'LEFTMOUSE': items.extend([ - ("mesh.loop_select", {"type": params.select_mouse, "value": 'DOUBLE_CLICK'}, - {"properties": [("extend", False), ("deselect", False), ("toggle", False)]}), + ("mesh.loop_select", {"type": params.select_mouse, "value": 'DOUBLE_CLICK'}, None), ("mesh.loop_select", {"type": params.select_mouse, "value": 'DOUBLE_CLICK', "shift": True}, - {"properties": [("extend", True), ("deselect", False), ("toggle", False)]}), + {"properties": [("extend", True)]}), ("mesh.loop_select", {"type": params.select_mouse, "value": 'DOUBLE_CLICK', "alt": True}, - {"properties": [("extend", False), ("deselect", True), ("toggle", False)]}), - ("mesh.edgering_select", {"type": params.select_mouse, "value": 'DOUBLE_CLICK', "ctrl": True}, - {"properties": [("extend", False), ("deselect", False), ("toggle", False)]}), + {"properties": [("deselect", True)]}), + ("mesh.edgering_select", {"type": params.select_mouse, "value": 'DOUBLE_CLICK', "ctrl": True}, None), ("mesh.edgering_select", {"type": params.select_mouse, "value": 'DOUBLE_CLICK', "shift": True, "ctrl": True}, - {"properties": [("extend", False), ("deselect", False), ("toggle", True)]}), + {"properties": [("toggle", True)]}), ]) if params.legacy: @@ -5953,7 +5930,7 @@ def km_node_editor_tool_select(params): {"space_type": 'NODE_EDITOR', "region_type": 'WINDOW'}, {"items": [ ("node.select", {"type": params.select_mouse, "value": 'PRESS'}, - {"properties": [("extend", False), ("deselect_all", not params.legacy)]}), + {"properties": [("deselect_all", not params.legacy)]}), ]}, ) @@ -7021,7 +6998,7 @@ def km_sequencer_editor_tool_select(params): {"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'}, {"items": [ ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS'}, - {"properties": [("extend", False), ("deselect_all", not params.legacy)]}), + {"properties": [("deselect_all", not params.legacy)]}), *_template_items_change_frame(params), ]}, ) diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index c39fcb790dd..1dbb859fd6c 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -503,6 +503,8 @@ static bool pose_select_linked_pick_poll(bContext *C) void POSE_OT_select_linked_pick(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Select Connected"; ot->idname = "POSE_OT_select_linked_pick"; @@ -517,11 +519,12 @@ void POSE_OT_select_linked_pick(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, - "extend", - false, - "Extend", - "Extend selection instead of deselecting everything first"); + prop = RNA_def_boolean(ot->srna, + "extend", + false, + "Extend", + "Extend selection instead of deselecting everything first"); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } static int pose_select_linked_exec(bContext *C, wmOperator *UNUSED(op)) diff --git a/source/blender/editors/space_clip/clip_graph_ops.c b/source/blender/editors/space_clip/clip_graph_ops.c index 590f8efe105..9a4e0c7f060 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.c +++ b/source/blender/editors/space_clip/clip_graph_ops.c @@ -327,6 +327,8 @@ static int select_invoke(bContext *C, wmOperator *op, const wmEvent *event) void CLIP_OT_graph_select(wmOperatorType *ot) { + PropertyRNA *prop; + /* identifiers */ ot->name = "Select"; ot->description = "Select graph curves"; @@ -351,11 +353,12 @@ void CLIP_OT_graph_select(wmOperatorType *ot) "Mouse location to select nearest entity", -100.0f, 100.0f); - RNA_def_boolean(ot->srna, - "extend", - 0, - "Extend", - "Extend selection rather than clearing the existing selection"); + prop = RNA_def_boolean(ot->srna, + "extend", + 0, + "Extend", + "Extend selection rather than clearing the existing selection"); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } /********************** box select operator *********************/ diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index 558c0bec11d..c7f0f4c228f 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -459,11 +459,12 @@ void CLIP_OT_select(wmOperatorType *ot) /* properties */ PropertyRNA *prop; - RNA_def_boolean(ot->srna, - "extend", - 0, - "Extend", - "Extend selection rather than clearing the existing selection"); + prop = RNA_def_boolean(ot->srna, + "extend", + 0, + "Extend", + "Extend selection rather than clearing the existing selection"); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); prop = RNA_def_boolean(ot->srna, "deselect_all", false, diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 8bfafc6bef8..2955c4ef7ae 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -417,6 +417,8 @@ static int graphkeys_click_insert_invoke(bContext *C, wmOperator *op, const wmEv void GRAPH_OT_click_insert(wmOperatorType *ot) { + PropertyRNA *prop; + /* Identifiers */ ot->name = "Click-Insert Keyframes"; ot->idname = "GRAPH_OT_click_insert"; @@ -443,11 +445,12 @@ void GRAPH_OT_click_insert(wmOperatorType *ot) RNA_def_float( ot->srna, "value", 1.0f, -FLT_MAX, FLT_MAX, "Value", "Value for keyframe on", 0, 100); - RNA_def_boolean(ot->srna, - "extend", - false, - "Extend", - "Extend selection instead of deselecting everything first"); + prop = RNA_def_boolean(ot->srna, + "extend", + false, + "Extend", + "Extend selection instead of deselecting everything first"); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); } /** \} */ diff --git a/source/blender/editors/space_node/node_select.cc b/source/blender/editors/space_node/node_select.cc index a1068f29624..adff85a2b8c 100644 --- a/source/blender/editors/space_node/node_select.cc +++ b/source/blender/editors/space_node/node_select.cc @@ -417,6 +417,7 @@ static int node_select_grouped_exec(bContext *C, wmOperator *op) void NODE_OT_select_grouped(wmOperatorType *ot) { + PropertyRNA *prop; static const EnumPropertyItem prop_select_grouped_types[] = { {NODE_SELECT_GROUPED_TYPE, "TYPE", 0, "Type", ""}, {NODE_SELECT_GROUPED_COLOR, "COLOR", 0, "Color", ""}, @@ -439,11 +440,12 @@ void NODE_OT_select_grouped(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - RNA_def_boolean(ot->srna, - "extend", - false, - "Extend", - "Extend selection instead of deselecting everything first"); + prop = RNA_def_boolean(ot->srna, + "extend", + false, + "Extend", + "Extend selection instead of deselecting everything first"); + RNA_def_property_flag(prop, PROP_SKIP_SAVE); ot->prop = RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", ""); } |