diff options
author | Campbell Barton <campbell@blender.org> | 2022-05-26 14:25:54 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-05-26 14:25:54 +0300 |
commit | 2a367689d4159c5eb44e30df7b441200a0bdadfc (patch) | |
tree | a45a3feeef4031735ccac525a37d6f7cf7d426d3 | |
parent | fdb1a7b5e1542d10d88fd7292ee86bc23ce3afa7 (diff) | |
parent | 790fe55c52057919b3f3f6e95f4e510719293eeb (diff) |
Merge branch 'blender-v3.2-release'
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 3e0d3dadcf1..180dc9a894d 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -2031,13 +2031,9 @@ def km_node_editor(params): items.extend(_template_node_select(type='LEFTMOUSE', value='PRESS', select_passthrough=True)) else: items.extend(_template_node_select( - type='RIGHTMOUSE', value=params.select_mouse_value, select_passthrough=False)) - items.extend([ - ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS'}, - {"properties": [("deselect_all", False)]}), - ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True}, - {"properties": [("toggle", True)]}), - ]) + type='RIGHTMOUSE', value=params.select_mouse_value, select_passthrough=True)) + items.extend(_template_node_select( + type='LEFTMOUSE', value='PRESS', select_passthrough=True)) items.extend([ ("node.select_box", {"type": params.select_mouse, "value": 'CLICK_DRAG'}, @@ -4774,7 +4770,7 @@ def _template_view3d_gpencil_select(*, type, value, legacy, use_select_mouse=Tru def _template_node_select(*, type, value, select_passthrough): items = [ ("node.select", {"type": type, "value": value}, - {"properties": [("deselect_all", True), ("select_passthrough", True)]}), + {"properties": [("deselect_all", True), ("select_passthrough", select_passthrough)]}), ("node.select", {"type": type, "value": value, "ctrl": True}, None), ("node.select", {"type": type, "value": value, "alt": True}, None), ("node.select", {"type": type, "value": value, "ctrl": True, "alt": True}, None), |