From 23888be4238f992e5f57638b953b01b778975e8f Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Wed, 1 Jun 2011 06:26:54 +0000 Subject: Usability Tweak [#27469] Adding/Rename markers (M/Ctrl-M) were restricted to only being available when the mouse was hovering just over the time scroller at the bottom of animation editors, as otherwise we'd get nasty keymap conflicts where markers keymap would block all the primary function keymaps. However, in the case of Adding/Renaming markers, there are no other keys which currently conflict with these in such cases. Hence, it is fine to let these ones be able to be run from anywhere within the animation editors, which should make it easier to add markers for lipsyncing purposes again for example. --- source/blender/editors/space_action/action_ops.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/editors/space_action/action_ops.c') diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index 43d9ae0f5c9..2ccad308676 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -40,6 +40,7 @@ #include "BLI_blenlib.h" #include "ED_anim_api.h" +#include "ED_markers.h" #include "ED_transform.h" #include "action_intern.h" @@ -193,6 +194,9 @@ static void action_keymap_keyframes (wmKeyConfig *keyconf, wmKeyMap *keymap) /* transform system */ transform_keymap_for_space(keyconf, keymap, SPACE_ACTION); + + /* special markers hotkeys for anim editors: see note in definition of this function */ + ED_marker_keymap_animedit_conflictfree(keymap); } /* --------------- */ -- cgit v1.2.3