[Bf-blender-cvs] [c9d9bfa84ad] master: Keymap: preference for fallback-tool with RMB select
Campbell Barton
noreply at git.blender.org
Tue Sep 21 10:25:43 CEST 2021
Commit: c9d9bfa84ad5cb985e3feccffa702b2f3cc2adf8
Author: Campbell Barton
Date: Tue Sep 21 17:55:43 2021 +1000
Branches: master
https://developer.blender.org/rBc9d9bfa84ad5cb985e3feccffa702b2f3cc2adf8
Keymap: preference for fallback-tool with RMB select
Expose a key-map preference "Fallback Tool (RMB)",
disabled by default.
The right mouse button uses the fallback tool
(currently visible selection tool in the toolbar),
instead of always tweaking.
When any selection tool is active, right mouse always tweaks.
To enable fallback selection on RMB, set the "Right Mouse Select Action"
to "Selection Tool".
Internal changes:
- Add fall-back key-maps, separate key-maps needed for when the tool is
run as a fall-back. This is needed so RMB-select can support fall-back
tools, so left-mouse can be used when it's the active tool and RMB
can be used as a fall-back action when another tool is active.
- Add options field to tools so tools without gizmos can enable the
full-back tool keymap.
- Support multiple key-maps for keymap handlers.
- Fall-back keymaps now co-exist with the tool-keymaps.
So both keymaps may be active at once - using different mouse buttons.
When gizmos are in use, a highlighted gizmo prioritizes the
tool-keymap over the fall-back keymap.
Resolves T83690.
Reviewed By: JulienKaspar
Ref D12493
===================================================================
M release/scripts/modules/bpy/utils/__init__.py
M release/scripts/presets/keyconfig/Blender.py
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/startup/bl_ui/space_toolsystem_common.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M source/blender/editors/interface/interface_template_search_menu.c
M source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
M source/blender/editors/screen/area.c
M source/blender/editors/space_view3d/view3d_gizmo_preselect.c
M source/blender/makesdna/DNA_workspace_types.h
M source/blender/makesrna/intern/rna_workspace_api.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_keymap.c
M source/blender/windowmanager/intern/wm_toolsystem.c
===================================================================
diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py
index afa04a18ef6..3f0248970c6 100644
--- a/release/scripts/modules/bpy/utils/__init__.py
+++ b/release/scripts/modules/bpy/utils/__init__.py
@@ -858,6 +858,7 @@ def register_tool(tool_cls, *, after=None, separator=False, group=False):
"description": getattr(tool_cls, "bl_description", tool_cls.__doc__),
"icon": getattr(tool_cls, "bl_icon", None),
"cursor": getattr(tool_cls, "bl_cursor", None),
+ "options": getattr(tool_cls, "bl_options", None),
"widget": getattr(tool_cls, "bl_widget", None),
"widget_properties": getattr(tool_cls, "bl_widget_properties", None),
"keymap": getattr(tool_cls, "bl_keymap", None),
diff --git a/release/scripts/presets/keyconfig/Blender.py b/release/scripts/presets/keyconfig/Blender.py
index eb66c961472..1690b03184a 100644
--- a/release/scripts/presets/keyconfig/Blender.py
+++ b/release/scripts/presets/keyconfig/Blender.py
@@ -54,6 +54,19 @@ class Prefs(bpy.types.KeyConfigPreferences):
default='PLAY',
update=update_fn,
)
+ rmb_action: EnumProperty(
+ name="Right Mouse Select Action",
+ items=(
+ ('TWEAK', "Select & Tweak",
+ "Right mouse always tweaks"),
+ ('FALLBACK_TOOL', "Selection Tool",
+ "Right mouse uses the selection tool"),
+ ),
+ description=(
+ "Default action for the right mouse button"
+ ),
+ update=update_fn,
+ )
use_alt_click_leader: BoolProperty(
name="Alt Click Tool Prompt",
description=(
@@ -179,6 +192,8 @@ class Prefs(bpy.types.KeyConfigPreferences):
if is_select_left:
col.row().prop(self, "gizmo_action", text="Activate Gizmo Event", expand=True)
+ else:
+ col.row().prop(self, "rmb_action", text="Right Mouse Select Action", expand=True)
# Checkboxes sub-layout.
col = layout.column()
@@ -232,6 +247,7 @@ def load():
kc_prefs.select_mouse == 'LEFT' and
kc_prefs.gizmo_action == 'DRAG'
),
+ use_fallback_tool=(True if (kc_prefs.select_mouse == 'LEFT') else (kc_prefs.rmb_action == 'FALLBACK_TOOL')),
use_alt_click_leader=kc_prefs.use_alt_click_leader,
use_pie_click_drag=kc_prefs.use_pie_click_drag,
),
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 44b77ab2aac..6a3064fc820 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -46,6 +46,8 @@ class Params:
"use_select_all_toggle",
# Activate gizmo on drag (which support it).
"use_gizmo_drag",
+ # Use the fallback tool instead of tweak for RMB select.
+ "use_fallback_tool",
# Use pie menu for tab by default (swap 'Tab/Ctrl-Tab').
"use_v3d_tab_menu",
# Use extended pie menu for shading.
@@ -59,6 +61,15 @@ class Params:
"v3d_tilde_action",
# Alt-MMB axis switching 'RELATIVE' or 'ABSOLUTE' axis switching.
"v3d_alt_mmb_drag_action",
+
+ # Convenience variables:
+ # (derived from other settings).
+ #
+ # This case needs to be checked often,
+ # convenience for: `params.use_fallback_tool if params.select_mouse == 'RIGHT' else False`.
+ "use_fallback_tool_rmb",
+ # Convenience for: `'CLICK' if params.use_fallback_tool_rmb else params.select_mouse_value`.
+ "select_mouse_value_fallback",
)
def __init__(
@@ -72,6 +83,7 @@ class Params:
spacebar_action='TOOL',
use_select_all_toggle=False,
use_gizmo_drag=True,
+ use_fallback_tool=False,
use_v3d_tab_menu=False,
use_v3d_shade_ex_pie=False,
use_v3d_mmb_pan=False,
@@ -96,6 +108,9 @@ class Params:
self.context_menu_event = {"type": 'W', "value": 'PRESS'}
self.cursor_set_event = {"type": 'LEFTMOUSE', "value": 'CLICK'}
self.cursor_tweak_event = None
+ self.use_fallback_tool = use_fallback_tool
+ self.use_fallback_tool_rmb = use_fallback_tool
+ self.select_mouse_value_fallback = 'CLICK' if self.use_fallback_tool_rmb else self.select_mouse_value
else:
# Left mouse select uses Click event for selection. This is a little
# less immediate, but is needed to distinguish between click and tweak
@@ -115,6 +130,10 @@ class Params:
self.cursor_set_event = {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}
self.cursor_tweak_event = {"type": 'EVT_TWEAK_R', "value": 'ANY', "shift": True}
+ self.use_fallback_tool = True
+ self.use_fallback_tool_rmb = False
+ self.select_mouse_value_fallback = self.select_mouse_value
+
self.use_mouse_emulate_3_button = use_mouse_emulate_3_button
@@ -147,6 +166,15 @@ NUMBERS_1 = ('ONE', 'TWO', 'THREE', 'FOUR', 'FIVE', 'SIX', 'SEVEN', 'EIGHT', 'NI
NUMBERS_0 = ('ZERO', 'ONE', 'TWO', 'THREE', 'FOUR', 'FIVE', 'SIX', 'SEVEN', 'EIGHT', 'NINE')
+# ------------------------------------------------------------------------------
+# Generic Utilities
+
+def _fallback_id(text, fallback):
+ if fallback:
+ return text + " (fallback)"
+ return text
+
+
# ------------------------------------------------------------------------------
# Keymap Item Wrappers
@@ -882,20 +910,25 @@ def km_uv_editor(params):
items.extend([
# Selection modes.
*_template_items_uv_select_mode(params),
+ *_template_uv_select(
+ type=params.select_mouse,
+ value=('CLICK' if params.use_fallback_tool_rmb else params.select_mouse_value),
+ legacy=params.legacy,
+ ),
("uv.mark_seam", {"type": 'E', "value": 'PRESS', "ctrl": True}, None),
- ("uv.select", {"type": params.select_mouse, "value": params.select_mouse_value},
- {"properties": [("deselect_all", not params.legacy)]}),
- ("uv.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True},
- {"properties": [("extend", True)]}),
("uv.select_loop", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True}, None),
("uv.select_loop", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "alt": True},
{"properties": [("extend", True)]}),
- ("uv.select_edge_ring", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "alt": True}, None),
- ("uv.select_edge_ring", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "shift": True, "alt": True},
+ ("uv.select_edge_ring",
+ {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "alt": True}, None),
+ ("uv.select_edge_ring",
+ {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "shift": True, "alt": True},
{"properties": [("extend", True)]}),
- ("uv.shortest_path_pick", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True},
+ ("uv.shortest_path_pick",
+ {"type": params.select_mouse, "value": params.select_mouse_value_fallback, "ctrl": True},
{"properties": [("use_fill", False)]}),
- ("uv.shortest_path_pick", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "shift": True},
+ ("uv.shortest_path_pick",
+ {"type": params.select_mouse, "value": params.select_mouse_value_fallback, "ctrl": True, "shift": True},
{"properties": [("use_fill", True)]}),
("uv.select_split", {"type": 'Y', "value": 'PRESS'}, None),
("uv.select_box", {"type": 'B', "value": 'PRESS'},
@@ -1196,20 +1229,11 @@ def km_view3d(params):
("view3d.view_axis", {"type": 'NDOF_BUTTON_TOP', "value": 'PRESS', "shift": True},
{"properties": [("type", 'TOP'), ("align_active", True)]}),
# Selection.
- *((
- "view3d.select",
- {"type": params.select_mouse, "value": params.select_mouse_value, **{m: True for m in mods}},
- {"properties": [(c, True) for c in props]},
- ) for props, mods in (
- (("deselect_all",) if not params.legacy else (), ()),
- (("toggle",), ("shift",)),
- (("center", "object"), ("ctrl",)),
- (("enumerate",), ("alt",)),
- (("toggle", "center"), ("shift", "ctrl")),
- (("center", "enumerate"), ("ctrl", "alt")),
- (("toggle", "enumerate"), ("shift", "alt")),
- (("toggle", "center", "enumerate"), ("shift", "ctrl", "alt")),
- )),
+ *_template_view3d_select(
+ type=params.select_mouse,
+ value=('CLICK' if params.use_fallback_tool_rmb else params.select_mouse_value),
+ legacy=params.legacy,
+ ),
("view3d.select_box", {"type": 'B', "value": 'PRESS'}, None),
("view3d.select_lasso", {"type": params.action_tweak, "value": 'ANY', "ctrl": True},
{"properties": [("mode", 'ADD')]}),
@@ -3203,7 +3227,7 @@ def km_grease_pencil(_params):
return keymap
-def _grease_pencil_selection(params):
+def _grease_pencil_selection(params, use_select_mouse=True):
return [
# Select all
*_template_items_select_actions(params, "gpencil.select_all"),
@@ -3225,13 +3249,12 @@ def _grease_pencil_selection(params):
{"properties": [("mode", 'ADD')]}),
("gpencil.select_lasso", {"type": params.action_tweak, "value": 'ANY', "shift": True, "ctrl": True, "alt": True},
{"properties": [("mode", 'SUB')]}),
- ("gpencil.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True},
- {"properties": [("extend", True), ("toggle", True)]}),
- # Whole stroke s
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list