[Bf-blender-cvs] [1616c7c538b] blender2.8: Fix error in recent key-item filtering

Campbell Barton noreply at git.blender.org
Thu Dec 13 12:39:31 CET 2018


Commit: 1616c7c538b4ba151f73c4d60b268f269b7a4021
Author: Campbell Barton
Date:   Thu Dec 13 22:19:11 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB1616c7c538b4ba151f73c4d60b268f269b7a4021

Fix error in recent key-item filtering

Grouping flags makes it impossible to exclude only modifiers for eg.

Fixes T59303

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

M	source/blender/windowmanager/wm_event_types.h

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

diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h
index 0fc4899e401..fad55171292 100644
--- a/source/blender/windowmanager/wm_event_types.h
+++ b/source/blender/windowmanager/wm_event_types.h
@@ -400,7 +400,7 @@ enum eEventType_Mask {
 	/* ISKEYMODIFIER */
 	EVT_TYPE_MASK_KEYBOARD_MODIFIER = (1 << 0),
 	/* ISKEYBOARD */
-	EVT_TYPE_MASK_KEYBOARD = (1 << 1) | EVT_TYPE_MASK_KEYBOARD_MODIFIER,
+	EVT_TYPE_MASK_KEYBOARD = (1 << 1),
 	/* ISMOUSE_WHEEL */
 	EVT_TYPE_MASK_MOUSE_WHEEL = (1 << 2),
 	/* ISMOUSE_BUTTON */
@@ -408,7 +408,7 @@ enum eEventType_Mask {
 	/* ISMOUSE_GESTURE */
 	EVT_TYPE_MASK_MOUSE_BUTTON = (1 << 4),
 	/* ISMOUSE */
-	EVT_TYPE_MASK_MOUSE = (1 << 5) | EVT_TYPE_MASK_MOUSE_WHEEL | EVT_TYPE_MASK_MOUSE_GESTURE | EVT_TYPE_MASK_MOUSE_BUTTON,
+	EVT_TYPE_MASK_MOUSE = (1 << 5),
 	/* ISNDOF */
 	EVT_TYPE_MASK_NDOF = (1 << 6),
 	/* ISTWEAK */



More information about the Bf-blender-cvs mailing list