[Bf-blender-cvs] [33166107857] blender-v2.81-release: Revert "Fix T71126: add old hotkeys to set start/end frame in the timeline to"

Philipp Oeser noreply at git.blender.org
Mon Nov 11 10:06:59 CET 2019


Commit: 331661078572200cde66b760d5346bfe10b8ef4d
Author: Philipp Oeser
Date:   Mon Nov 11 09:59:41 2019 +0100
Branches: blender-v2.81-release
https://developer.blender.org/rB331661078572200cde66b760d5346bfe10b8ef4d

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.

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

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 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:



More information about the Bf-blender-cvs mailing list