archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Keymaps: fix broken LMB select and transform tweak in 2D editors.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-11-23 15:52:10 +01:00
parent 322cf89a14
commit e1c393b51a
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
release/scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@@ -1203,12 +1203,12 @@ def km_markers(params):
("marker.add", {"type": 'M', "value": 'PRESS'}, None), ("marker.add", {"type": 'M', "value": 'PRESS'}, None),
("marker.move", {"type": params.select_tweak, "value": 'ANY'}, None), ("marker.move", {"type": params.select_tweak, "value": 'ANY'}, None),
("marker.duplicate", {"type": 'D', "value": 'PRESS', "shift": True}, None), ("marker.duplicate", {"type": 'D', "value": 'PRESS', "shift": True}, None),
("marker.select", {"type": params.select_mouse, "value": params.select_mouse_value}, None), ("marker.select", {"type": params.select_mouse, "value": 'PRESS'}, None),
("marker.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True}, ("marker.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True)]}), {"properties": [("extend", True)]}),
("marker.select", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True}, ("marker.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
{"properties": [("extend", False), ("camera", True)]}), {"properties": [("extend", False), ("camera", True)]}),
("marker.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True}, ("marker.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True},
{"properties": [("extend", True), ("camera", True)]}), {"properties": [("extend", True), ("camera", True)]}),
("marker.select_box", {"type": 'B', "value": 'PRESS'}, None), ("marker.select_box", {"type": 'B', "value": 'PRESS'}, None),
*_template_items_select_actions(params, "marker.select_all"), *_template_items_select_actions(params, "marker.select_all"),
@@ -1258,21 +1258,21 @@ def km_graph_editor(params):
("wm.context_toggle", {"type": 'H', "value": 'PRESS', "ctrl": True}, ("wm.context_toggle", {"type": 'H', "value": 'PRESS', "ctrl": True},
{"properties": [("data_path", 'space_data.show_handles')]}), {"properties": [("data_path", 'space_data.show_handles')]}),
("graph.cursor_set", {"type": params.action_mouse, "value": 'PRESS'}, None), ("graph.cursor_set", {"type": params.action_mouse, "value": 'PRESS'}, None),
("graph.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value}, ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False), ("column", False), ("curves", False)]}), {"properties": [("extend", False), ("column", False), ("curves", False)]}),
("graph.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True}, ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
{"properties": [("extend", False), ("column", True), ("curves", False)]}), {"properties": [("extend", False), ("column", True), ("curves", False)]}),
("graph.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True}, ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True), ("column", False), ("curves", False)]}), {"properties": [("extend", True), ("column", False), ("curves", False)]}),
("graph.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "alt": True}, ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True},
{"properties": [("extend", True), ("column", True), ("curves", False)]}), {"properties": [("extend", True), ("column", True), ("curves", False)]}),
("graph.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "alt": True}, ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "alt": True},
{"properties": [("extend", False), ("column", False), ("curves", True)]}), {"properties": [("extend", False), ("column", False), ("curves", True)]}),
("graph.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True, "alt": True}, ("graph.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True},
{"properties": [("extend", True), ("column", False), ("curves", True)]}), {"properties": [("extend", True), ("column", False), ("curves", True)]}),
("graph.select_leftright", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True}, ("graph.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", False)]}), {"properties": [("mode", 'CHECK'), ("extend", False)]}),
("graph.select_leftright", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True}, ("graph.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", True)]}), {"properties": [("mode", 'CHECK'), ("extend", True)]}),
("graph.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'}, ("graph.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
{"properties": [("mode", 'LEFT'), ("extend", False)]}), {"properties": [("mode", 'LEFT'), ("extend", False)]}),
@@ -1619,7 +1619,7 @@ def km_info(params):
) )
items.extend([ items.extend([
("info.select_pick", {"type": params.select_mouse, "value": params.select_mouse_value}, None), ("info.select_pick", {"type": params.select_mouse, "value": 'PRESS'}, None),
("info.select_all_toggle", {"type": 'A', "value": 'PRESS'}, None), ("info.select_all_toggle", {"type": 'A', "value": 'PRESS'}, None),
("info.select_box", {"type": 'B', "value": 'PRESS'}, None), ("info.select_box", {"type": 'B', "value": 'PRESS'}, None),
("info.report_replay", {"type": 'R', "value": 'PRESS'}, None), ("info.report_replay", {"type": 'R', "value": 'PRESS'}, None),
@@ -1788,21 +1788,21 @@ def km_dopesheet(params):
) )
items.extend([ items.extend([
("action.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value}, ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False), ("column", False), ("channel", False)]}), {"properties": [("extend", False), ("column", False), ("channel", False)]}),
("action.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True}, ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
{"properties": [("extend", False), ("column", True), ("channel", False)]}), {"properties": [("extend", False), ("column", True), ("channel", False)]}),
("action.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True}, ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True), ("column", False), ("channel", False)]}), {"properties": [("extend", True), ("column", False), ("channel", False)]}),
("action.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "alt": True}, ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True},
{"properties": [("extend", True), ("column", True), ("channel", False)]}), {"properties": [("extend", True), ("column", True), ("channel", False)]}),
("action.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True, "alt": True}, ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True, "alt": True},
{"properties": [("extend", False), ("column", False), ("channel", True)]}), {"properties": [("extend", False), ("column", False), ("channel", True)]}),
("action.clickselect", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True, "alt": True}, ("action.clickselect", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True, "alt": True},
{"properties": [("extend", True), ("column", False), ("channel", True)]}), {"properties": [("extend", True), ("column", False), ("channel", True)]}),
("action.select_leftright", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True}, ("action.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", False)]}), {"properties": [("mode", 'CHECK'), ("extend", False)]}),
("action.select_leftright", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True}, ("action.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", True)]}), {"properties": [("mode", 'CHECK'), ("extend", True)]}),
("action.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'}, ("action.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
{"properties": [("mode", 'LEFT'), ("extend", False)]}), {"properties": [("mode", 'LEFT'), ("extend", False)]}),
@@ -1936,13 +1936,13 @@ def km_nla_editor(params):
) )
items.extend([ items.extend([
("nla.click_select", {"type": params.select_mouse, "value": params.select_mouse_value}, ("nla.click_select", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False)]}), {"properties": [("extend", False)]}),
("nla.click_select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True}, ("nla.click_select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True)]}), {"properties": [("extend", True)]}),
("nla.select_leftright", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True}, ("nla.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", False)]}), {"properties": [("mode", 'CHECK'), ("extend", False)]}),
("nla.select_leftright", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": True}, ("nla.select_leftright", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "ctrl": True},
{"properties": [("mode", 'CHECK'), ("extend", True)]}), {"properties": [("mode", 'CHECK'), ("extend", True)]}),
("nla.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'}, ("nla.select_leftright", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
{"properties": [("mode", 'LEFT'), ("extend", False)]}), {"properties": [("mode", 'LEFT'), ("extend", False)]}),
@@ -2279,17 +2279,17 @@ def km_sequencer(params):
for i in range(10) for i in range(10)
) )
), ),
("sequencer.select", {"type": params.select_mouse, "value": params.select_mouse_value}, ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False), ("linked_handle", False), ("left_right", 'NONE'), ("linked_time", False)]}), {"properties": [("extend", False), ("linked_handle", False), ("left_right", 'NONE'), ("linked_time", False)]}),
("sequencer.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True}, ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True), ("linked_handle", False), ("left_right", 'NONE'), ("linked_time", False)]}), {"properties": [("extend", True), ("linked_handle", False), ("left_right", 'NONE'), ("linked_time", False)]}),
("sequencer.select", {"type": params.select_mouse, "value": params.select_mouse_value, "alt": True}, ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "alt": True},
{"properties": [("extend", False), ("linked_handle", True), ("left_right", 'NONE'), ("linked_time", False)]}), {"properties": [("extend", False), ("linked_handle", True), ("left_right", 'NONE'), ("linked_time", False)]}),
("sequencer.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "alt": True}, ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True, "alt": True},
{"properties": [("extend", True), ("linked_handle", True), ("left_right", 'NONE'), ("linked_time", False)]}), {"properties": [("extend", True), ("linked_handle", True), ("left_right", 'NONE'), ("linked_time", False)]}),
("sequencer.select", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True}, ("sequencer.select", {"type": params.select_mouse, "value": 'PRESS', "ctrl": True},
{"properties": [("extend", False), ("linked_handle", False), ("left_right", 'MOUSE'), ("linked_time", True)]}), {"properties": [("extend", False), ("linked_handle", False), ("left_right", 'MOUSE'), ("linked_time", True)]}),
("sequencer.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True, "ctrl": 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)]}), {"properties": [("extend", True), ("linked_handle", False), ("left_right", 'NONE'), ("linked_time", True)]}),
("sequencer.select_more", {"type": 'NUMPAD_PLUS', "value": 'PRESS', "ctrl": True}, None), ("sequencer.select_more", {"type": 'NUMPAD_PLUS', "value": 'PRESS', "ctrl": True}, None),
("sequencer.select_less", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "ctrl": True}, None), ("sequencer.select_less", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "ctrl": True}, None),
@@ -2504,9 +2504,9 @@ def km_clip_editor(params):
("clip.frame_jump", {"type": 'RIGHT_ARROW', "value": 'PRESS', "shift": True, "alt": True}, ("clip.frame_jump", {"type": 'RIGHT_ARROW', "value": 'PRESS', "shift": True, "alt": True},
{"properties": [("position", 'PATHSTART')]}), {"properties": [("position", 'PATHSTART')]}),
("clip.change_frame", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None), ("clip.change_frame", {"type": 'LEFTMOUSE', "value": 'PRESS'}, None),
("clip.select", {"type": params.select_mouse, "value": params.select_mouse_value}, ("clip.select", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False)]}), {"properties": [("extend", False)]}),
("clip.select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True}, ("clip.select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True)]}), {"properties": [("extend", True)]}),
*_template_items_select_actions(params, "clip.select_all"), *_template_items_select_actions(params, "clip.select_all"),
("clip.select_box", {"type": 'B', "value": 'PRESS'}, None), ("clip.select_box", {"type": 'B', "value": 'PRESS'}, None),
@@ -2575,9 +2575,9 @@ def km_clip_graph_editor(params):
items.extend([ items.extend([
("clip.change_frame", {"type": params.action_mouse, "value": 'PRESS'}, None), ("clip.change_frame", {"type": params.action_mouse, "value": 'PRESS'}, None),
("clip.graph_select", {"type": params.select_mouse, "value": params.select_mouse_value}, ("clip.graph_select", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False)]}), {"properties": [("extend", False)]}),
("clip.graph_select", {"type": params.select_mouse, "value": params.select_mouse_value, "shift": True}, ("clip.graph_select", {"type": params.select_mouse, "value": 'PRESS', "shift": True},
{"properties": [("extend", True)]}), {"properties": [("extend", True)]}),
*_template_items_select_actions(params, "clip.graph_select_all_markers"), *_template_items_select_actions(params, "clip.graph_select_all_markers"),
("clip.graph_select_box", {"type": 'B', "value": 'PRESS'}, None), ("clip.graph_select_box", {"type": 'B', "value": 'PRESS'}, None),