[Bf-blender-cvs] [53923f502d0] master: Fix T95078: Setting digits as modifier in keymap doesn't work

Campbell Barton noreply at git.blender.org
Fri Jan 21 05:20:24 CET 2022


Commit: 53923f502d0f92e5bb3e60e543d69cd38146e874
Author: Campbell Barton
Date:   Fri Jan 21 15:19:01 2022 +1100
Branches: master
https://developer.blender.org/rB53923f502d0f92e5bb3e60e543d69cd38146e874

Fix T95078: Setting digits as modifier in keymap doesn't work

Allow any non-modifier keyboard events to be used.

Note that the existing check for >= EVT_AKEY allowed NDOF and other
non-keyboard events (including modifiers, which didn't work).

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

M	source/blender/makesrna/intern/rna_wm.c

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

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 8c128292fd7..c64a47fc2ab 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -965,7 +965,7 @@ static void rna_wmKeyMapItem_keymodifier_set(PointerRNA *ptr, int value)
   if (value == EVT_ESCKEY) {
     /* pass */
   }
-  else if (value >= EVT_AKEY) {
+  else if (ISKEYBOARD(value) && !ISKEYMODIFIER(value)) {
     kmi->keymodifier = value;
   }
   else {



More information about the Bf-blender-cvs mailing list