[Bf-blender-cvs] [244c39f1abb] master: Revert "Keymap: Drag in empty area to box select in animation editors"
Brecht Van Lommel
noreply at git.blender.org
Mon May 27 12:37:31 CEST 2019
Commit: 244c39f1abb8cb787c0f97d72b962eb10a883f9e
Author: Brecht Van Lommel
Date: Mon May 27 12:35:23 2019 +0200
Branches: master
https://developer.blender.org/rB244c39f1abb8cb787c0f97d72b962eb10a883f9e
Revert "Keymap: Drag in empty area to box select in animation editors"
This reverts commit ebf924e0b79b6ebea4401d0b0f2e59e2c103a66d. This is causing
the transform tool to start immediately which leads to lots of accidental
changes. We can bring this back when that issue is fixed.
===================================================================
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 3f6281b0833..fb549fb3a14 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -1343,7 +1343,7 @@ def km_graph_editor(params):
("column", False), ("curves", False)]}),
("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
{"properties": [("extend", False), ("column", True), ("curves", False)]}),
- ("graph.clickselect", {"type": params.select_mouse, "value": 'CLICK', "shift": True},
+ ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True), ("column", False), ("curves", False)]}),
("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True},
{"properties": [("extend", True), ("column", True), ("curves", False)]}),
@@ -1351,7 +1351,7 @@ 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": 'CLICK', "ctrl": 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)]}),
@@ -1368,12 +1368,6 @@ def km_graph_editor(params):
{"properties": [("axis_range", False), ("include_handles", True)]}),
("graph.select_box", {"type": 'B', "value": 'PRESS', "ctrl": True, "alt": True},
{"properties": [("axis_range", True), ("include_handles", True)]}),
- ("graph.select_box", {"type": params.select_tweak, "value": 'ANY'},
- {"properties":[("axis_range", False), ("include_handles", False), ("wait_for_input", False), ("mode", 'SET')]}),
- ("graph.select_box", {"type": params.select_tweak, "value": 'ANY', "shift": True},
- {"properties":[("axis_range", False), ("include_handles", False), ("wait_for_input", False), ("mode", 'ADD')]}),
- ("graph.select_box", {"type": params.select_tweak, "value": 'ANY', "ctrl": True},
- {"properties":[("axis_range", False),("include_handles", False), ("wait_for_input", False), ("mode", 'SUB')]}),
("graph.select_lasso", {"type": params.action_tweak, "value": 'ANY', "ctrl": True},
{"properties": [("mode", 'ADD')]}),
("graph.select_lasso", {"type": params.action_tweak, "value": 'ANY', "shift": True, "ctrl": True},
@@ -1421,7 +1415,7 @@ def km_graph_editor(params):
{"properties": [("only_active", False)]}),
("anim.channels_editable_toggle", {"type": 'TAB', "value": 'PRESS'}, None),
("transform.translate", {"type": 'G', "value": 'PRESS'}, None),
- ("transform.translate", {"type": params.select_mouse, "value": 'PRESS'}, None),
+ ("transform.translate", {"type": params.select_tweak, "value": 'ANY'}, None),
("transform.transform", {"type": 'E', "value": 'PRESS'},
{"properties": [("mode", 'TIME_EXTEND')]}),
("transform.rotate", {"type": 'R', "value": 'PRESS'}, None),
@@ -1876,7 +1870,7 @@ def km_dopesheet(params):
("column", False), ("channel", False)]}),
("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
{"properties": [("extend", False), ("column", True), ("channel", False)]}),
- ("action.clickselect", {"type": params.select_mouse, "value": 'CLICK', "shift": True},
+ ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True), ("column", False), ("channel", False)]}),
("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True},
{"properties": [("extend", True), ("column", True), ("channel", False)]}),
@@ -1884,7 +1878,7 @@ 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": 'CLICK', "ctrl": 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)]}),
@@ -1897,12 +1891,6 @@ def km_dopesheet(params):
{"properties": [("axis_range", False)]}),
("action.select_box", {"type": 'B', "value": 'PRESS', "alt": True},
{"properties": [("axis_range", True)]}),
- ("action.select_box", {"type": params.select_tweak, "value": 'ANY'},
- {"properties":[("axis_range", False), ("wait_for_input", False), ("mode", 'SET')]}),
- ("action.select_box", {"type": params.select_tweak, "value": 'ANY', "shift": True},
- {"properties":[("axis_range", False), ("wait_for_input", False), ("mode", 'ADD')]}),
- ("action.select_box", {"type": params.select_tweak, "value": 'ANY', "ctrl": True},
- {"properties":[("axis_range", False), ("wait_for_input", False), ("mode", 'SUB')]}),
("action.select_lasso", {"type": params.action_tweak, "value": 'ANY', "ctrl": True},
{"properties": [("mode", 'ADD')]}),
("action.select_lasso", {"type": params.action_tweak, "value": 'ANY', "shift": True, "ctrl": True},
@@ -1945,7 +1933,7 @@ def km_dopesheet(params):
("anim.channels_find", {"type": 'F', "value": 'PRESS', "ctrl": True}, None),
("transform.transform", {"type": 'G', "value": 'PRESS'},
{"properties": [("mode", 'TIME_TRANSLATE')]}),
- ("transform.transform", {"type": params.select_mouse, "value": 'PRESS'},
+ ("transform.transform", {"type": params.select_tweak, "value": 'ANY'},
{"properties": [("mode", 'TIME_TRANSLATE')]}),
("transform.transform", {"type": 'E', "value": 'PRESS'},
{"properties": [("mode", 'TIME_EXTEND')]}),
@@ -2027,7 +2015,7 @@ 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": 'CLICK', "ctrl": 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)]}),
@@ -2040,12 +2028,6 @@ def km_nla_editor(params):
{"properties": [("axis_range", False)]}),
("nla.select_box", {"type": 'B', "value": 'PRESS', "alt": True},
{"properties": [("axis_range", True)]}),
- ("nla.select_box", {"type": params.select_tweak, "value": 'ANY'},
- {"properties":[("wait_for_input", False), ("mode", 'SET')]}),
- ("nla.select_box", {"type": params.select_tweak, "value": 'ANY', "shift": True},
- {"properties":[("wait_for_input", False), ("mode", 'ADD')]}),
- ("nla.select_box", {"type": params.select_tweak, "value": 'ANY', "ctrl": True},
- {"properties":[("wait_for_input", False), ("mode", 'SUB')]}),
("nla.previewrange_set", {"type": 'P', "value": 'PRESS', "ctrl": True, "alt": True}, None),
("nla.view_all", {"type": 'HOME', "value": 'PRESS'}, None),
("nla.view_all", {"type": 'NDOF_BUTTON_FIT', "value": 'PRESS'}, None),
@@ -2075,7 +2057,7 @@ def km_nla_editor(params):
("nla.fmodifier_add", {"type": 'M', "value": 'PRESS', "shift": True, "ctrl": True}, None),
("transform.transform", {"type": 'G', "value": 'PRESS'},
{"properties": [("mode", 'TRANSLATION')]}),
- ("transform.transform", {"type": params.select_mouse, "value": 'PRESS'},
+ ("transform.transform", {"type": params.select_tweak, "value": 'ANY'},
{"properties": [("mode", 'TRANSLATION')]}),
("transform.transform", {"type": 'E', "value": 'PRESS'},
{"properties": [("mode", 'TIME_EXTEND')]}),
@@ -2341,7 +2323,7 @@ def km_sequencer(params):
("sequencer.select", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False), ("deselect_all", True),
("linked_handle", False), ("left_right", 'NONE'), ("linked_time", False)]}),
- ("sequencer.select", {"type": params.select_mouse, "value": 'CLICK', "shift": True},
+ ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True), ("linked_handle", False), ("left_right", 'NONE'), ("linked_time", False)]}),
("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
{"properties": [("extend", False), ("linked_handle", True), ("left_right", 'NONE'), ("linked_time", False)]}),
@@ -2359,12 +2341,6 @@ def km_sequencer(params):
{"properties": [("extend", True)]}),
("sequencer.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None),
("sequencer.select_box", {"type": 'B', "value": 'PRESS'}, None),
- ("sequencer.select_box", {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list