[Bf-blender-cvs] [b2a20c2d9e6] master: Fix T66074: Number shortcut for brushes doesn't work

[Campbell Barton]

Commit: b2a20c2d9e6910a35daa468a933431c84bb3c928
Author: Campbell Barton
Date:   Tue Jun 25 01:06:17 2019 +1000
Branches: master
https://developer.blender.org/rBb2a20c2d9e6910a35daa468a933431c84bb3c928

Fix T66074: Number shortcut for brushes doesn't work

Add number brush switching for 2.7x map.

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

M	release/scripts/presets/keyconfig/keymap_data/blender_default.py
M	release/scripts/startup/bl_operators/wm.py

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

diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index b04ad7f47b6..8f3f6468134 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -316,6 +316,15 @@ def _template_items_tool_select_actions_simple(operator, *, type, value, propert
     ]
 
 
+def _template_items_legacy_tools_from_numbers():
+    return [
+        ("wm.tool_set_by_index",
+         {"type": NUMBERS_1[i % 10], "value": 'PRESS', "shift": i >= 10},
+         {"properties": [("index", i)]})
+        for i in range(20)
+    ]
+
+
 # ------------------------------------------------------------------------------
 # Window, Screen, Areas, Regions
 
@@ -3629,6 +3638,9 @@ def km_image_paint(params):
         op_panel("VIEW3D_PT_paint_texture_context_menu", params.context_menu_event),
     ])
 
+    if params.legacy:
+        items.extend(_template_items_legacy_tools_from_numbers())
+
     return keymap
 
 
@@ -3672,6 +3684,9 @@ def km_vertex_paint(params):
         op_panel("VIEW3D_PT_paint_vertex_context_menu", params.context_menu_event),
     ])
 
+    if params.legacy:
+        items.extend(_template_items_legacy_tools_from_numbers())
+
     return keymap
 
 
@@ -3716,6 +3731,10 @@ def km_weight_paint(params):
             ("view3d.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True}, None),
         ])
 
+
+    if params.legacy:
+        items.extend(_template_items_legacy_tools_from_numbers())
+
     return keymap
 
 
@@ -3810,6 +3829,9 @@ def km_sculpt(params):
         op_panel("VIEW3D_PT_sculpt_context_menu", params.context_menu_event),
     ])
 
+    if params.legacy:
+        items.extend(_template_items_legacy_tools_from_numbers())
+
     return keymap
 
 
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 003c92097eb..35f8a289e45 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -1559,7 +1559,7 @@ class WM_OT_tool_set_by_index(Operator):
 
     expand: BoolProperty(
         description="Include tool sub-groups",
-        default=False,
+        default=True,
     )
 
     space_type: rna_space_type_prop