Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-01-13 06:30:12 +0300
committerCampbell Barton <campbell@blender.org>2022-01-13 06:30:12 +0300
commitf1a488d0f2d3736482d68b96d7b4edecdae2beda (patch)
treee0f0959e694f13dc44018657db58f254d1797f57
parenta7c9fb59ca9f2cd21ae65c85453932852f75d5b4 (diff)
Fix T92953: Tool Settings: Drag on Tweak fails with LMB select
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 543742709ef..a006cd787ea 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -6267,7 +6267,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)),
]},
@@ -6385,7 +6386,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)]}),
]),
@@ -6467,7 +6468,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)),
@@ -7377,7 +7378,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)),
@@ -7553,7 +7554,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(