[Bf-blender-cvs] [017b8dfe47b] master: Cleanup: expand left/right select keymap items

Campbell Barton noreply at git.blender.org
Wed Jun 12 03:13:10 CEST 2019


Commit: 017b8dfe47b56c64f6d2d708f9f358cf66dedc41
Author: Campbell Barton
Date:   Wed Jun 12 11:11:39 2019 +1000
Branches: master
https://developer.blender.org/rB017b8dfe47b56c64f6d2d708f9f358cf66dedc41

Cleanup: expand left/right select keymap items

This was meant to simplify the keymap but ended up
not having a significant advantage.

===================================================================

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 1e34b5699fb..62d71e62fe8 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1357,10 +1357,12 @@ 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, "shift": extend, "alt": not params.legacy},
-           {"properties": [("mode", 'CHECK'), ("extend", extend)]}
-        ) for extend in (False, True)),
+        ("graph.select_leftright",
+         {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "alt": not params.legacy},
+         {"properties": [("mode", 'CHECK'), ("extend", False)]}),
+        ("graph.select_leftright",
+         {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "shift": True, "alt": not params.legacy},
+         {"properties": [("mode", 'CHECK'), ("extend", True)]}),
         ("graph.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
          {"properties": [("mode", 'LEFT'), ("extend", False)]}),
         ("graph.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
@@ -1889,10 +1891,12 @@ 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, "shift": extend, "alt": not params.legacy},
-           {"properties": [("mode", 'CHECK'), ("extend", extend)]}
-        ) for extend in (False, True)),
+        ("action.select_leftright",
+         {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "alt": not params.legacy},
+         {"properties": [("mode", 'CHECK'), ("extend", False)]}),
+        ("action.select_leftright",
+         {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "shift": True, "alt": not params.legacy},
+         {"properties": [("mode", 'CHECK'), ("extend", True)]}),
         ("action.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
          {"properties": [("mode", 'LEFT'), ("extend", False)]}),
         ("action.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
@@ -2030,10 +2034,12 @@ 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, "shift": extend, "alt": not params.legacy},
-           {"properties": [("mode", 'CHECK'), ("extend", extend)]}
-        ) for extend in (False, True)),
+        ("nla.select_leftright",
+         {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "alt": not params.legacy},
+         {"properties": [("mode", 'CHECK'), ("extend", False)]}),
+        ("nla.select_leftright",
+         {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "shift": True, "alt": not params.legacy},
+         {"properties": [("mode", 'CHECK'), ("extend", True)]}),
         ("nla.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
          {"properties": [("mode", 'LEFT'), ("extend", False)]}),
         ("nla.select_leftright", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
@@ -2350,10 +2356,12 @@ 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, "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",
+         {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "alt": not params.legacy},
+         {"properties": [("linked_handle", False), ("left_right", 'MOUSE'), ("linked_time", True), ("extend", False)]}),
+        ("sequencer.select",
+         {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "shift": True, "alt": not params.legacy},
+         {"properties": [("linked_handle", False), ("left_right", 'MOUSE'), ("linked_time", True), ("extend", 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'},



More information about the Bf-blender-cvs mailing list