[Bf-blender-cvs] [1604a26] master: Fix T44251: Changing views using numpad broken

Julian Eisel noreply at git.blender.org
Sat Apr 4 19:23:47 CEST 2015


Commit: 1604a26fe648ba712cf2cbead2a96dbd0dab817c
Author: Julian Eisel
Date:   Sat Apr 4 19:17:39 2015 +0200
Branches: master
https://developer.blender.org/rB1604a26fe648ba712cf2cbead2a96dbd0dab817c

Fix T44251: Changing views using numpad broken

For KM_ANY I've filtered out every event that has a click type, although
that was only needed for the additional event sent on KM_HOLD. A bit weird
that this only happened on a few machines though.

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

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

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

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index ce9a729..5fd6342 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1460,8 +1460,8 @@ static int wm_eventmatch(wmEvent *winevent, wmKeyMapItem *kmi)
 	if (kmitype != KM_ANY)
 		if (winevent->type != kmitype) return 0;
 
-	/* KM_ANY excludes click_type events - filter them out */
-	if (kmi->val == KM_ANY && winevent->click_type) return 0;
+	/* KM_ANY excludes KM_HOLD since it's time based and not a real input - filter it out */
+	if (kmi->val == KM_ANY && winevent->click_type == KM_HOLD) return 0;
 
 	if (kmi->val != KM_ANY)
 		if (!ELEM(kmi->val, winevent->val, winevent->click_type)) return 0;




More information about the Bf-blender-cvs mailing list