[Bf-blender-cvs] [5928af1] master: Fix: jump to next/previous marker shortcut keys conflicted with others in clip editor.

[Brecht Van Lommel]

Commit: 5928af11ef97d6d9318d3a06fe32f0d77fc48e9c
Author: Brecht Van Lommel
Date:   Mon Nov 25 19:10:08 2013 +0100
http://developer.blender.org/rB5928af11ef97d6d9318d3a06fe32f0d77fc48e9c

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.

===================================================================

M	source/blender/editors/screen/screen_ops.c

===================================================================

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 576d31d..e2f00d1 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);