blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T42088: Creating new keybinds can cause duplicates when saving key config profile 

When patching a keymap with a 'UserPref' diff one, do not add keymap items from diff
if they already exists in patched keymap.
This commit is contained in:
Bastien Montagne 2014-10-06 22:08:37 +02:00
parent b4860de6f1
commit 0d8a007c69
Notes: blender-bot 2023-02-14 10:00:04 +01:00 
Referenced by issue #42137, Keymap editing is broken
Referenced by issue #42088, Creating new keybinds can cause duplicates when saving key config profile
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/windowmanager/intern/wm_keymap.c
View File

@ -589,8 +589,12 @@ 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. */
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 (!kmdi->remove_item || kmi_remove) {
if (!kmi_add && (!kmdi->remove_item || kmi_remove)) {
kmi_add = wm_keymap_item_copy(kmdi->add_item);
kmi_add->flag |= KMI_USER_MODIFIED;