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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-25 22:10:08 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-25 22:14:12 +0400
commit5928af11ef97d6d9318d3a06fe32f0d77fc48e9c (patch)
treed4a434e2cedc41e547ef8ce8cdfeabc03a9f26c2
parentd6e257d4474dbf8a055b10da1998c82b9c1e8f49 (diff)
Fix: jump to next/previous marker shortcut keys conflicted with others in clip editor.
Disable them for now and leave to for keymap revamp to assign them shortcut keys or not.
-rw-r--r--source/blender/editors/screen/screen_ops.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 576d31dc5ec..e2f00d10e1e 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4078,12 +4078,6 @@ void ED_keymap_screen(wmKeyConfig *keyconf)
kmi = WM_keymap_add_item(keymap, "SCREEN_OT_keyframe_jump", MEDIAFIRST, KM_PRESS, 0, 0);
RNA_boolean_set(kmi->ptr, "next", FALSE);
- kmi = WM_keymap_add_item(keymap, "SCREEN_OT_marker_jump", RIGHTARROWKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "next", TRUE);
-
- kmi = WM_keymap_add_item(keymap, "SCREEN_OT_marker_jump", LEFTARROWKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "next", FALSE);
-
/* play (forward and backwards) */
WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", AKEY, KM_PRESS, KM_ALT, 0);