From 5928af11ef97d6d9318d3a06fe32f0d77fc48e9c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 25 Nov 2013 19:10:08 +0100 Subject: 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. --- source/blender/editors/screen/screen_ops.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'source/blender/editors/screen') 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); -- cgit v1.2.3