[Bf-blender-cvs] [ff6bf13] master: Fix T37811: Delete key shortcut missing for deleting markers

Joshua Leung noreply at git.blender.org
Sat Dec 14 01:42:55 CET 2013


Commit: ff6bf133ad07d61b25fa3d5e74c4068c11990f9a
Author: Joshua Leung
Date:   Sat Dec 14 13:42:42 2013 +1300
http://developer.blender.org/rBff6bf133ad07d61b25fa3d5e74c4068c11990f9a

Fix T37811: Delete key shortcut missing for deleting markers

The keymap here used WM_keymap_verify_item(), which only allows for a
single hotkey to be bound to an operator. In most cases, this really
isn't justified.

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

M	source/blender/editors/animation/anim_markers.c

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

diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 9818c31..4af3c05 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -1516,8 +1516,8 @@ void ED_marker_keymap(wmKeyConfig *keyconf)
 	
 	WM_keymap_verify_item(keymap, "MARKER_OT_select_border", BKEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "MARKER_OT_select_all", AKEY, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "MARKER_OT_delete", XKEY, KM_PRESS, 0, 0);
-	WM_keymap_verify_item(keymap, "MARKER_OT_delete", DELKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MARKER_OT_delete", XKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MARKER_OT_delete", DELKEY, KM_PRESS, 0, 0);
 	WM_keymap_verify_item(keymap, "MARKER_OT_rename", MKEY, KM_PRESS, KM_CTRL, 0);
 	
 	WM_keymap_add_item(keymap, "MARKER_OT_move", GKEY, KM_PRESS, 0, 0);




More information about the Bf-blender-cvs mailing list