[Bf-blender-cvs] [ae3f68a3950] master: Fix T59991: duplicate entries for node select operators in keymap.
Brecht Van Lommel
noreply at git.blender.org
Mon Dec 31 14:12:52 CET 2018
Commit: ae3f68a39505e719305801547a16f546ac342c74
Author: Brecht Van Lommel
Date: Mon Dec 31 14:11:42 2018 +0100
Branches: master
https://developer.blender.org/rBae3f68a39505e719305801547a16f546ac342c74
Fix T59991: duplicate entries for node select operators in keymap.
Ref D4055.
===================================================================
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 f7cd09225b5..e8f21fb8b04 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1513,39 +1513,34 @@ def km_node_editor(params):
{"items": items},
)
+ def node_select_ops(select_mouse):
+ return [
+ ("node.select", {"type": select_mouse, "value": 'PRESS'},
+ {"properties": [("extend", False)]}),
+ ("node.select", {"type": select_mouse, "value": 'PRESS', "ctrl": True},
+ {"properties": [("extend", False)]}),
+ ("node.select", {"type": select_mouse, "value": 'PRESS', "alt": True},
+ {"properties": [("extend", False)]}),
+ ("node.select", {"type": select_mouse, "value": 'PRESS', "ctrl": True, "alt": True},
+ {"properties": [("extend", False)]}),
+ ("node.select", {"type": select_mouse, "value": 'PRESS', "shift": True},
+ {"properties": [("extend", True)]}),
+ ("node.select", {"type": select_mouse, "value": 'PRESS', "shift": True, "ctrl": True},
+ {"properties": [("extend", True)]}),
+ ("node.select", {"type": select_mouse, "value": 'PRESS', "shift": True, "alt": True},
+ {"properties": [("extend", True)]}),
+ ("node.select", {"type": select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True},
+ {"properties": [("extend", True)]}),
+ ]
+
+ # Allow node selection with both for RMB select
+ if params.select_mouse == 'RIGHTMOUSE':
+ items.extend(node_select_ops('LEFTMOUSE'))
+ items.extend(node_select_ops('RIGHTMOUSE'))
+ else:
+ items.extend(node_select_ops('LEFTMOUSE'))
+
items.extend([
- ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS'},
- {"properties": [("extend", False)]}),
- ("node.select", {"type": params.select_mouse, "value": 'PRESS'},
- {"properties": [("extend", False)]}),
- ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
- {"properties": [("extend", False)]}),
- ("node.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
- {"properties": [("extend", False)]}),
- ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "alt": True},
- {"properties": [("extend", False)]}),
- ("node.select", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
- {"properties": [("extend", False)]}),
- ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True, "alt": True},
- {"properties": [("extend", False)]}),
- ("node.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "alt": True},
- {"properties": [("extend", False)]}),
- ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
- {"properties": [("extend", True)]}),
- ("node.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
- {"properties": [("extend", True)]}),
- ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True, "ctrl": True},
- {"properties": [("extend", True)]}),
- ("node.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True},
- {"properties": [("extend", True)]}),
- ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True, "alt": True},
- {"properties": [("extend", True)]}),
- ("node.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True},
- {"properties": [("extend", True)]}),
- ("node.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True, "ctrl": True, "alt": True},
- {"properties": [("extend", True)]}),
- ("node.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True},
- {"properties": [("extend", True)]}),
("node.select_box", {"type": params.select_tweak, "value": 'ANY'},
{"properties": [("tweak", True)]}),
("node.select_lasso", {"type": 'EVT_TWEAK_L', "value": 'ANY', "ctrl": True, "alt": True},
More information about the Bf-blender-cvs
mailing list