Commit: 1d462e172981671f9d023f2a37fdb0f2c1055b4d
Author: Campbell Barton
Date: Thu Jan 13 14:30:12 2022 +1100
Branches: blender-v3.0-release
https://developer.blender.org/rB1d462e172981671f9d023f2a37fdb0f2c1055b4d
Fix T92953: Tool Settings: Drag on Tweak fails with LMB select
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 6a837e64b78..1eb5355a274 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -6258,7 +6258,8 @@ def km_image_editor_tool_uv_select(params, *, fallback):
_fallback_id("Image Editor Tool: Uv, Tweak", fallback),
{"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
{"items": [
- *([] if fallback else _template_items_tool_select(params,
"uv.select", "uv.cursor_set", extend="extend")),
+ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else
_template_items_tool_select(
+ params, "uv.select", "uv.cursor_set", extend="extend")),
*([] if (not params.use_fallback_tool_rmb) else
_template_uv_select(
type=params.select_mouse, value=params.select_mouse_value,
legacy=params.legacy)),
]},
@@ -6376,7 +6377,7 @@ def km_node_editor_tool_select(params, *, fallback):
_fallback_id("Node Tool: Tweak", fallback),
{"space_type": 'NODE_EDITOR', "region_type": 'WINDOW'},
{"items": [
- *([] if fallback else [
+ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else [
("node.select", {"type": params.select_mouse, "value":
'PRESS'},
{"properties": [("deselect_all", not params.legacy)]}),
]),
@@ -6458,7 +6459,7 @@ def km_3d_view_tool_select(params, *, fallback):
_fallback_id("3D View Tool: Tweak", fallback),
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": [
- *([] if fallback else _template_items_tool_select(
+ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else
_template_items_tool_select(
params, "view3d.select", "view3d.cursor3d", extend="toggle")),
*([] if (not params.use_fallback_tool_rmb) else
_template_view3d_select(
type=params.select_mouse, value=params.select_mouse_value,
legacy=params.legacy)),
@@ -7368,7 +7369,7 @@ def km_3d_view_tool_edit_gpencil_select(params, *,
fallback):
_fallback_id("3D View Tool: Edit Gpencil, Tweak", fallback),
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": [
- *([] if fallback else _template_items_tool_select(
+ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else
_template_items_tool_select(
params, "gpencil.select", "view3d.cursor3d", extend="toggle")),
*([] if (not params.use_fallback_tool_rmb) else
_template_view3d_gpencil_select(
type=params.select_mouse, value=params.select_mouse_value,
legacy=params.legacy)),
@@ -7544,7 +7545,7 @@ def km_sequencer_editor_tool_generic_select(params, *,
fallback):
_fallback_id("Sequencer Tool: Tweak", fallback),
{"space_type": 'SEQUENCE_EDITOR', "region_type": 'WINDOW'},
{"items": [
- *([] if fallback else _template_items_tool_select(
+ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else
_template_items_tool_select(
params, "sequencer.select", "sequencer.cursor_set",
extend="toggle")),
*([] if (not params.use_fallback_tool_rmb) else
_template_sequencer_preview_select(
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
