griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Partial revert of recent toolsystem defaults

Browse Source 
- 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.
This commit is contained in:
Campbell Barton
2018-09-27 21:18:02 +10:00
parent 14e7fcfdde
commit 250a377592
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
View File

@@ -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)),
),
)

4
source/blender/windowmanager/intern/wm_toolsystem.c
View File

@@ -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;
}