From dffee8b3236ac02cab151cff864f47de45c553ea Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 29 Oct 2023 20:08:39 +1100 Subject: [PATCH] Revert "Revert "Fix #112441: Restore Key Map Item does not restore the active property"" This reverts commit 0f36ac4e662f4c00f0f16bd3684a822e8b629f2a. This revert was only done for testing and wasn't ment to be pushed. --- source/blender/windowmanager/intern/wm_keymap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/windowmanager/intern/wm_keymap.cc b/source/blender/windowmanager/intern/wm_keymap.cc index 859774a1f61..7e98caede4e 100644 --- a/source/blender/windowmanager/intern/wm_keymap.cc +++ b/source/blender/windowmanager/intern/wm_keymap.cc @@ -2107,7 +2107,7 @@ void WM_keymap_item_restore_to_default(wmWindowManager *wm, wmKeyMap *keymap, wm kmi->keymodifier = orig->keymodifier; kmi->maptype = orig->maptype; kmi->flag = (kmi->flag & ~(KMI_REPEAT_IGNORE | KMI_INACTIVE)) | - (orig->flag & KMI_REPEAT_IGNORE); + (orig->flag & (KMI_REPEAT_IGNORE | KMI_INACTIVE)); WM_keyconfig_update_tag(keymap, kmi); }