[Bf-blender-cvs] [e36cc29] master: Fix T42137: Keymap editing is broken

Bastien Montagne noreply at git.blender.org
Tue Oct 7 23:41:40 CEST 2014


Commit: e36cc29a69c57c9818fcb5018dead575ba7e4263
Author: Bastien Montagne
Date:   Tue Oct 7 23:39:56 2014 +0200
Branches: master
https://developer.blender.org/rBe36cc29a69c57c9818fcb5018dead575ba7e4263

Fix T42137: Keymap editing is broken

Own mistake in previous fix here, was too greedy in finding an existing kmi of UserPref add diff kmi, we only want
to ignore exact same kmi's here.

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

M	source/blender/windowmanager/intern/wm_keymap.c

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

diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 1abe000..ff90de4 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -590,9 +590,8 @@ static void wm_keymap_patch(wmKeyMap *km, wmKeyMap *diff_km)
 		/* add item */
 		if (kmdi->add_item) {
 			/* Do not re-add an already existing keymap item! See T42088. */
+			/* We seek only for exact copy here! See T42137. */
 			kmi_add = wm_keymap_find_item_equals(km, kmdi->add_item);
-			if (!kmi_add)
-				kmi_add = wm_keymap_find_item_equals_result(km, kmdi->add_item);
 			/* only if nothing to remove or item to remove found */
 			if (!kmi_add && (!kmdi->remove_item || kmi_remove)) {
 				kmi_add = wm_keymap_item_copy(kmdi->add_item);




More information about the Bf-blender-cvs mailing list