From 325b0ad2ed85577e08b8d27fbb3f62d7157da512 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 11 Jun 2019 17:44:30 +1000 Subject: [PATCH] Keymap: fix conflict introduced by recent Alt-LMB for scrubbing Use Ctrl-Alt modifier for select-left/right. --- .../keyconfig/keymap_data/blender_default.py | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 715b062814d..10ebb80df91 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -1357,10 +1357,10 @@ def km_graph_editor(params): {"properties": [("extend", False), ("column", False), ("curves", True)]}), ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, {"properties": [("extend", True), ("column", False), ("curves", True)]}), - ("graph.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True}, - {"properties": [("mode", 'CHECK'), ("extend", False)]}), - ("graph.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True}, - {"properties": [("mode", 'CHECK'), ("extend", True)]}), + *(("graph.select_leftright", + {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "shift": extend, "alt": not params.legacy}, + {"properties": [("mode", 'CHECK'), ("extend", extend)]} + ) for extend in (False, True)), ("graph.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'}, {"properties": [("mode", 'LEFT'), ("extend", False)]}), ("graph.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, @@ -1887,10 +1887,10 @@ def km_dopesheet(params): {"properties": [("extend", False), ("column", False), ("channel", True)]}), ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True}, {"properties": [("extend", True), ("column", False), ("channel", True)]}), - ("action.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True}, - {"properties": [("mode", 'CHECK'), ("extend", False)]}), - ("action.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True}, - {"properties": [("mode", 'CHECK'), ("extend", True)]}), + *(("action.select_leftright", + {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "shift": extend, "alt": not params.legacy}, + {"properties": [("mode", 'CHECK'), ("extend", extend)]} + ) for extend in (False, True)), ("action.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'}, {"properties": [("mode", 'LEFT'), ("extend", False)]}), ("action.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, @@ -2026,10 +2026,10 @@ def km_nla_editor(params): {"properties": [("extend", False), ("deselect_all", not params.legacy)]}), ("nla.click_select", {"type": params.select_mouse, "value": 'PRESS', "shift": True}, {"properties": [("extend", True)]}), - ("nla.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True}, - {"properties": [("mode", 'CHECK'), ("extend", False)]}), - ("nla.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True}, - {"properties": [("mode", 'CHECK'), ("extend", True)]}), + *(("nla.select_leftright", + {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "shift": extend, "alt": not params.legacy}, + {"properties": [("mode", 'CHECK'), ("extend", extend)]} + ) for extend in (False, True)), ("nla.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'}, {"properties": [("mode", 'LEFT'), ("extend", False)]}), ("nla.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, @@ -2344,10 +2344,10 @@ def km_sequencer(params): {"properties": [("extend", False), ("linked_handle", True), ("left_right", 'NONE'), ("linked_time", False)]}), ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True}, {"properties": [("extend", True), ("linked_handle", True), ("left_right", 'NONE'), ("linked_time", False)]}), - ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True}, - {"properties": [("extend", False), ("linked_handle", False), ("left_right", 'MOUSE'), ("linked_time", True)]}), - ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True}, - {"properties": [("extend", True), ("linked_handle", False), ("left_right", 'NONE'), ("linked_time", True)]}), + *(("sequencer.select", + {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "shift": extend, "alt": not params.legacy}, + {"properties": [("linked_handle", False), ("left_right", 'MOUSE'), ("linked_time", True), ("extend", extend)]} + ) for extend in (False, True)), ("sequencer.select_more", {"type": 'NUMPAD_PLUS', "value": 'PRESS', "ctrl": True}, None), ("sequencer.select_less", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "ctrl": True}, None), ("sequencer.select_linked_pick", {"type": 'L', "value": 'PRESS'},