[Bf-blender-cvs] [250a377592c] blender2.8: Partial revert of recent toolsystem defaults

[Campbell Barton]

Commit: 250a377592ca79d473700170f3be716e40cbedfd
Author: Campbell Barton
Date:   Thu Sep 27 21:18:02 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB250a377592ca79d473700170f3be716e40cbedfd

Partial revert of recent toolsystem defaults

- Use ctrl for de-select since we may want to use shift for extend.
- Use cursor tool by default,
  it's agreed lasso select isn't accessible from a shortcut by default.

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

M	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M	source/blender/windowmanager/intern/wm_toolsystem.c

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

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 33ec44b47dc..cd3e2248b58 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -386,7 +386,7 @@ class _defs_view3d_select:
                  dict(type='EVT_TWEAK_A', value='ANY')),
                 ("view3d.select_border",
                  dict(mode='SUB'),
-                 dict(type='EVT_TWEAK_A', value='ANY', shift=True)),
+                 dict(type='EVT_TWEAK_A', value='ANY', ctrl=True)),
             ),
             draw_settings=draw_settings,
         )
@@ -406,7 +406,7 @@ class _defs_view3d_select:
                  dict(type='ACTIONMOUSE', value='PRESS')),
                 ("view3d.select_circle",
                  dict(deselect=True),
-                 dict(type='ACTIONMOUSE', value='PRESS', shift=True)),
+                 dict(type='ACTIONMOUSE', value='PRESS', ctrl=True)),
             ),
             draw_settings=draw_settings,
         )
@@ -426,7 +426,7 @@ class _defs_view3d_select:
                  dict(type='EVT_TWEAK_A', value='ANY')),
                 ("view3d.select_lasso",
                  dict(mode='SUB'),
-                 dict(type='EVT_TWEAK_A', value='ANY', shift=True)),
+                 dict(type='EVT_TWEAK_A', value='ANY', ctrl=True)),
             ),
             draw_settings=draw_settings,
         )
@@ -1187,7 +1187,7 @@ class _defs_uv_select:
                  dict(type='EVT_TWEAK_A', value='ANY')),
                 # ("uv.select_border",
                 #  dict(deselect=True),
-                #  dict(type='EVT_TWEAK_A', value='ANY', shift=True)),
+                #  dict(type='EVT_TWEAK_A', value='ANY', ctrl=True)),
             ),
         )
 
@@ -1203,7 +1203,7 @@ class _defs_uv_select:
                  dict(type='ACTIONMOUSE', value='PRESS')),
                 # ("uv.select_circle",
                 #  dict(deselect=True),
-                #  dict(type='ACTIONMOUSE', value='PRESS', shift=True)),
+                #  dict(type='ACTIONMOUSE', value='PRESS', ctrl=True)),
             ),
         )
 
@@ -1219,7 +1219,7 @@ class _defs_uv_select:
                  dict(type='EVT_TWEAK_A', value='ANY')),
                 # ("uv.select_lasso",
                 #  dict(deselect=True),
-                #  dict(type='EVT_TWEAK_A', value='ANY', shift=True)),
+                #  dict(type='EVT_TWEAK_A', value='ANY', ctrl=True)),
             ),
         )
 
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c
index 3b93c7aee5b..a0859c8aa4b 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -558,7 +558,11 @@ static const char *toolsystem_default_tool(const bToolKey *tkey)
 				case CTX_MODE_PARTICLE:
 					return "Comb";
 				default:
+					/* FIXME(campbell): disable for now since this means we can't lasso select by default. */
+#if 0
 					return "Select Border";
+#endif
+					break;
 			}
 			break;
 	}