[Bf-blender-cvs] [b24de94c292] blender2.8: Cleanup: de-duplicate 3d view select items

[Campbell Barton]

Commit: b24de94c29237586470ec061312f64780097ba74
Author: Campbell Barton
Date:   Fri Nov 16 10:41:17 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBb24de94c29237586470ec061312f64780097ba74

Cleanup: de-duplicate 3d view select items

===================================================================

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	source/blender/editors/space_view3d/view3d_select.c

===================================================================

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index bbd5e2565ff..2914cde9e63 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -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')]}),
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index c421c96e530..de7b327fa96 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -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);