blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 745 Projects 19 Wiki Activity

Cleanup: de-duplicate 3d view select items

This commit is contained in:
Campbell Barton 2018-11-16 10:41:17 +11:00
parent a915da221f
commit b24de94c29
2 changed files with 19 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -887,78 +887,19 @@ def km_view3d(params):
("view3d.view_axis", {"type": 'NDOF_BUTTON_TOP', "value": 'PRESS', "shift": True},
{"properties": [("type", 'TOP'), ("align_active", True)]}),
# Selection.
("view3d.select", {"type": params.select_mouse, "value": params.select_mouse_value},
{"properties": [
("extend", False),
("deselect", False),
("toggle", False),
("center", False),
("enumerate", False),
("object", False),
], },),
("view3d.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True},
{"properties": [
("extend", False),
("deselect", False),
("toggle", True),
("center", False),
("enumerate", False),
("object", False),
], },),
("view3d.select", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True},
{"properties": [
("extend", False),
("deselect", False),
("toggle", False),
("center", True),
("enumerate", False),
("object", True),
], },),
("view3d.select", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True},
{"properties": [
("extend", False),
("deselect", False),
("toggle", False),
("center", False),
("enumerate", True),
("object", False),
], },),
("view3d.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True},
{"properties": [
("extend", True),
("deselect", False),
("toggle", True),
("center", True),
("enumerate", False),
("object", False),
], },),
("view3d.select", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "alt": True},
{"properties": [
("extend", False),
("deselect", False),
("toggle", False),
("center", True),
("enumerate", True),
("object", False),
], },),
("view3d.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "alt": True},
{"properties": [
("extend", False),
("deselect", False),
("toggle", True),
("center", False),
("enumerate", True),
("object", False),
], },),
("view3d.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True, "alt": True},
{"properties": [
("extend", False),
("deselect", False),
("toggle", True),
("center", True),
("enumerate", True),
("object", False),
], },),
*(("view3d.select",
{"type": params.select_mouse, "value": params.select_mouse_value, **{m: True for m in mods}},
{"properties": [(c, True) for c in props]},
) for props, mods in (
((), ()),
(("toggle",), ("shift",)),
(("center", "object"), ("ctrl",)),
(("enumerate",), ("alt",)),
(("extend", "toggle", "center"), ("shift", "ctrl")),
(("center", "enumerate"), ("ctrl", "alt")),
(("toggle", "enumerate"), ("shift", "alt")),
(("toggle", "center", "enumerate"), ("shift", "ctrl", "alt")),
)),
("view3d.select_box", {"type": 'B', "value": 'PRESS'}, None),
("view3d.select_lasso", {"type": params.action_tweak, "value": 'ANY', "ctrl": True},
{"properties": [("mode", 'ADD')]}),

9
source/blender/editors/space_view3d/view3d_select.c
View File

@ -2773,9 +2773,12 @@ void VIEW3D_OT_select(wmOperatorType *ot)
/* properties */
WM_operator_properties_mouse_select(ot);
RNA_def_boolean(ot->srna, "center", 0, "Center", "Use the object center when selecting, in editmode used to extend object selection");
RNA_def_boolean(ot->srna, "enumerate", 0, "Enumerate", "List objects under the mouse (object mode only)");
RNA_def_boolean(ot->srna, "object", 0, "Object", "Use object selection (editmode only)");
prop = RNA_def_boolean(ot->srna, "center", 0, "Center", "Use the object center when selecting, in editmode used to extend object selection");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
prop = RNA_def_boolean(ot->srna, "enumerate", 0, "Enumerate", "List objects under the mouse (object mode only)");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
prop = RNA_def_boolean(ot->srna, "object", 0, "Object", "Use object selection (editmode only)");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
prop = RNA_def_int_vector(ot->srna, "location", 2, NULL, INT_MIN, INT_MAX, "Location", "Mouse location", INT_MIN, INT_MAX);
RNA_def_property_flag(prop, PROP_HIDDEN);