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:
authorJoshua Leung <aligorith@gmail.com>2011-06-01 10:26:54 +0400
committerJoshua Leung <aligorith@gmail.com>2011-06-01 10:26:54 +0400
commit23888be4238f992e5f57638b953b01b778975e8f (patch)
tree397f0cd6be4b220c6940227706015571db3e693e /source/blender/editors/animation/anim_markers.c
parentc6dbb0b201da73008c35920cb40f3d84fcb35a9f (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/animation/anim_markers.c')
-rw-r--r--source/blender/editors/animation/anim_markers.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index c802ba621f1..f61c1ff7962 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -1495,3 +1495,14 @@ void ED_marker_keymap(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "MARKER_OT_camera_bind", BKEY, KM_PRESS, KM_CTRL, 0);
#endif
}
+
+/* to be called from animation editor keymaps, see note below */
+void ED_marker_keymap_animedit_conflictfree(wmKeyMap *keymap)
+{
+ /* duplicate of some marker-hotkeys but without the bounds checking
+ * since these are handy to be able to do unrestricted and won't conflict
+ * with primary function hotkeys (Usability tweak [#27469])
+ */
+ WM_keymap_add_item(keymap, "MARKER_OT_add", MKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "MARKER_OT_rename", MKEY, KM_PRESS, KM_CTRL, 0);
+}