diff options
author | Joshua Leung <aligorith@gmail.com> | 2011-06-01 10:26:54 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2011-06-01 10:26:54 +0400 |
commit | 23888be4238f992e5f57638b953b01b778975e8f (patch) | |
tree | 397f0cd6be4b220c6940227706015571db3e693e /source/blender/editors/include/ED_markers.h | |
parent | c6dbb0b201da73008c35920cb40f3d84fcb35a9f (diff) |
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.
Diffstat (limited to 'source/blender/editors/include/ED_markers.h')
-rw-r--r-- | source/blender/editors/include/ED_markers.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h index f804e052301..8476e67acd5 100644 --- a/source/blender/editors/include/ED_markers.h +++ b/source/blender/editors/include/ED_markers.h @@ -72,6 +72,9 @@ void ED_operatortypes_marker(void); /* called in screen_ops.c:ED_keymap_screen() */ void ED_marker_keymap(struct wmKeyConfig *keyconf); +/* called in animation editors - keymap defines */ +void ED_marker_keymap_animedit_conflictfree(struct wmKeyMap *keymap); + /* debugging only */ void debug_markers_print_list(struct ListBase *markers); |