Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-11-11 11:59:41 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-11-11 11:59:41 +0300
commit331661078572200cde66b760d5346bfe10b8ef4d (patch)
tree3114f4a53c15562ec7ad48293f60ee4e406e6f81
parentdf4f29b928b7fc443b8fe7eb853e6c6a873fc434 (diff)
Revert "Fix T71126: add old hotkeys to set start/end frame in the timeline to"
This caused T71483. Having timeline and dopesheet merged in 2.8 makes using S/E keys in timeline not work well. 2.7x keymap needs to fit with 2.8x internals, so probably 2.7x keymap will have to live with Ctrl+Home / Ctrl+End here. This reverts commit 4fbcbbfb967cb0fdff11dfc1646a1c55bca96f1d.
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 8a86ece53ce..6ad0ccf8a5f 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -2855,17 +2855,6 @@ def km_animation(params):
{"items": items},
)
- if not params.legacy:
- items.extend([
- ("anim.start_frame_set", {"type": 'HOME', "value": 'PRESS', "ctrl": True}, None),
- ("anim.end_frame_set", {"type": 'END', "value": 'PRESS', "ctrl": True}, None),
- ])
- else:
- items.extend([
- ("anim.start_frame_set", {"type": 'S', "value": 'PRESS'}, None),
- ("anim.end_frame_set", {"type": 'E', "value": 'PRESS'}, None),
- ])
-
items.extend([
# Frame management.
("wm.context_toggle", {"type": 'T', "value": 'PRESS', "ctrl": True},
@@ -2873,6 +2862,8 @@ def km_animation(params):
# Preview range.
("anim.previewrange_set", {"type": 'P', "value": 'PRESS'}, None),
("anim.previewrange_clear", {"type": 'P', "value": 'PRESS', "alt": True}, None),
+ ("anim.start_frame_set", {"type": 'HOME', "value": 'PRESS', "ctrl": True}, None),
+ ("anim.end_frame_set", {"type": 'END', "value": 'PRESS', "ctrl": True}, None),
])
if params.select_mouse == 'LEFTMOUSE' and not params.legacy: