[Bf-blender-cvs] [665d987e7ba] master: Keymap: use tap/drag for mode switching w/ pref enabled

[Campbell Barton]

Commit: 665d987e7ba6a5037b7c14e84433a0854f2b5f77
Author: Campbell Barton
Date:   Thu Feb 28 01:02:14 2019 +1100
Branches: master
https://developer.blender.org/rB665d987e7ba6a5037b7c14e84433a0854f2b5f77

Keymap: use tap/drag for mode switching w/ pref enabled

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

M	release/scripts/presets/keyconfig/blender.py
M	release/scripts/presets/keyconfig/keymap_data/blender_default.py

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

diff --git a/release/scripts/presets/keyconfig/blender.py b/release/scripts/presets/keyconfig/blender.py
index c4db99b9aae..138214f836d 100644
--- a/release/scripts/presets/keyconfig/blender.py
+++ b/release/scripts/presets/keyconfig/blender.py
@@ -88,8 +88,9 @@ class Prefs(bpy.types.KeyConfigPreferences):
             "Activate some pie menus on drag,\n"
             "allowing the tapping the same key to have a secondary action.\n"
             "\n"
-             "\u2022 Tapping Z in the 3D view toggles wireframe.\n"
-             "\u2022 Tapping Tilde in the 3D view for first person navigation"
+             "\u2022 Tapping Tab in the 3D view toggles edit-mode, drag for mode menu.\n"
+             "\u2022 Tapping Z in the 3D view toggles wireframe, drag for draw modes.\n"
+             "\u2022 Tapping Tilde in the 3D view for first person navigation, drag for view axes"
         ),
         default=False,
         update=update_fn,
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 8ffc1cbbf2c..c88aff33fd3 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -4201,7 +4201,13 @@ def km_object_non_modal(params):
         {"items": items},
     )
 
-    if not params.use_v3d_tab_menu:
+    if params.use_pie_click_drag:
+        items.extend([
+            ("object.mode_set", {"type": 'TAB', "value": 'CLICK'},
+             {"properties": [("mode", 'EDIT'), ("toggle", True)]}),
+            op_menu_pie("VIEW3D_MT_object_mode_pie", {"type": 'TAB', "value": 'CLICK_DRAG'}),
+        ])
+    elif not params.use_v3d_tab_menu:
         items.extend([
             ("object.mode_set", {"type": 'TAB', "value": 'PRESS'},
              {"properties": [("mode", 'EDIT'), ("toggle", True)]}),