diff options
| author | Campbell Barton <campbell@blender.org> | 2022-08-12 07:43:53 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-08-12 07:43:53 +0300 |
| commit | 7f733e294d5485178df800685c69cc15547ee73c (patch) | |
| tree | d7cd26b254f209f136a01bf163fe2a0d96c4d2df /release | |
| parent | b751275af294ed62c3eb312ace1b16c476314053 (diff) | |
| parent | 95cc5c6081d1f208028484e02d18881b7ccc6886 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 13 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 6 |
2 files changed, 5 insertions, 14 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index d08efc6909b..efc70f22321 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -490,16 +490,13 @@ def _template_items_tool_select( ] if params.select_mouse == 'LEFTMOUSE': - # By default use 'PRESS' for immediate select without quick delay. - # Fallback key-maps 'CLICK' since 'PRESS' events passes through (allowing either click or drag). - # - # NOTE: When the active (non-fallback) tool uses a key-map that activates it's primary tool on drag, - # it's important that this key-map uses click and not press. Otherwise it becomes impossible to use - # the tool without selecting elements under the cursor. + # Use 'PRESS' for immediate select without delay. + # Tools that allow dragging anywhere should _NOT_ enable the fallback tool + # unless it is expected that the tool should operate on the selection (click-drag to rip for e.g.). return [ - (operator, {"type": 'LEFTMOUSE', "value": 'CLICK' if fallback else 'PRESS'}, + (operator, {"type": 'LEFTMOUSE', "value": 'PRESS'}, {"properties": [("deselect_all", True), *operator_props]}), - (operator, {"type": 'LEFTMOUSE', "value": 'CLICK' if fallback else 'PRESS', "shift": True}, + (operator, {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, {"properties": [("toggle", True), *operator_props]}), # Fallback key-map must transform as the primary tool is expected diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 69ff5eebb70..20021762d5a 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -125,7 +125,6 @@ class _defs_view3d_generic: icon="ops.view3d.ruler", widget="VIEW3D_GGT_ruler", keymap="3D View Tool: Measure", - options={'KEYMAP_FALLBACK'}, ) @@ -529,7 +528,6 @@ class _defs_view3d_add: widget="VIEW3D_GGT_placement", keymap="3D View Tool: Object, Add Primitive", draw_settings=draw_settings, - options={'KEYMAP_FALLBACK'}, ) @ToolDef.from_fn @@ -556,7 +554,6 @@ class _defs_view3d_add: widget="VIEW3D_GGT_placement", keymap="3D View Tool: Object, Add Primitive", draw_settings=draw_settings, - options={'KEYMAP_FALLBACK'}, ) @ToolDef.from_fn @@ -582,7 +579,6 @@ class _defs_view3d_add: widget="VIEW3D_GGT_placement", keymap="3D View Tool: Object, Add Primitive", draw_settings=draw_settings, - options={'KEYMAP_FALLBACK'}, ) @ToolDef.from_fn @@ -608,7 +604,6 @@ class _defs_view3d_add: widget="VIEW3D_GGT_placement", keymap="3D View Tool: Object, Add Primitive", draw_settings=draw_settings, - options={'KEYMAP_FALLBACK'}, ) @ToolDef.from_fn @@ -633,7 +628,6 @@ class _defs_view3d_add: widget="VIEW3D_GGT_placement", keymap="3D View Tool: Object, Add Primitive", draw_settings=draw_settings, - options={'KEYMAP_FALLBACK'}, ) |