blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-04-20 17:40:39 +10:00
parent 2a96e8be39 0e6c56760c
commit 0e7871f9c3
Notes: blender-bot 2023-02-14 02:41:05 +01:00 
Referenced by issue #75862, Texture Paint is Laggy
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,6 +296,17 @@ def _template_items_proportional_editing(*, connected=False):
]
def _template_items_change_frame(params):
if params.select_mouse == 'LEFTMOUSE' and not params.legacy:
return [
("anim.change_frame", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, None),
]
else:
return [
("anim.change_frame", {"type": params.action_mouse, "value": 'PRESS'}, None),
]
# Tool System Templates
def _template_items_tool_select(params, operator, cursor_operator, *, extend):
@ -2073,6 +2084,7 @@ def km_dopesheet(params):
("marker.rename", {"type": 'M', "value": 'PRESS', "ctrl": True}, None),
("marker.camera_bind", {"type": 'B', "value": 'PRESS', "ctrl": True}, None),
*_template_items_context_menu("DOPESHEET_MT_context_menu", params.context_menu_event),
*_template_items_change_frame(params),
])
return keymap
@ -2198,6 +2210,7 @@ def km_nla_editor(params):
("marker.add", {"type": 'M', "value": 'PRESS'}, None),
("marker.rename", {"type": 'M', "value": 'PRESS', "ctrl": True}, None),
*_template_items_context_menu("NLA_MT_context_menu", params.context_menu_event),
*_template_items_change_frame(params),
])
return keymap
@ -2930,15 +2943,6 @@ def km_animation(params):
("anim.end_frame_set", {"type": 'END', "value": 'PRESS', "ctrl": True}, None),
])
if params.select_mouse == 'LEFTMOUSE' and not params.legacy:
items.extend([
("anim.change_frame", {"type": 'RIGHTMOUSE', "value": 'PRESS', "shift": True}, None),
])
else:
items.extend([
("anim.change_frame", {"type": params.action_mouse, "value": 'PRESS'}, None),
])
return keymap
@ -6519,6 +6523,7 @@ def km_sequencer_editor_tool_select(params):
{"items": [
("sequencer.select", {"type": params.select_mouse, "value": 'PRESS'},
{"properties": [("extend", False), ("deselect_all", not params.legacy)]}),
*_template_items_change_frame(params),
]},
)