From e18164dbab59ae5c9f0f1dd1ba12d1a97538919b Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Tue, 21 Jul 2009 12:19:46 +0000 Subject: 2.5 Overlooked WM event.val usage without checking proper #defines. My previous commit made all input not work on any modifier key press. --- source/blender/windowmanager/intern/wm_event_system.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source') diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 0df0679f98b..5377e351ff0 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1472,23 +1472,23 @@ void wm_event_add_ghostevent(wmWindow *win, int type, void *customdata) /* modifiers */ if (event.type==LEFTSHIFTKEY || event.type==RIGHTSHIFTKEY) { - event.shift= evt->shift= event.val; - if(event.val && (evt->ctrl || evt->alt || evt->oskey)) + event.shift= evt->shift= (event.val==KM_PRESS); + if(event.val==KM_PRESS && (evt->ctrl || evt->alt || evt->oskey)) event.shift= evt->shift = 3; // define? } else if (event.type==LEFTCTRLKEY || event.type==RIGHTCTRLKEY) { - event.ctrl= evt->ctrl= event.val; - if(event.val && (evt->shift || evt->alt || evt->oskey)) + event.ctrl= evt->ctrl= (event.val==KM_PRESS); + if(event.val==KM_PRESS && (evt->shift || evt->alt || evt->oskey)) event.ctrl= evt->ctrl = 3; // define? } else if (event.type==LEFTALTKEY || event.type==RIGHTALTKEY) { - event.alt= evt->alt= event.val; - if(event.val && (evt->ctrl || evt->shift || evt->oskey)) + event.alt= evt->alt= (event.val==KM_PRESS); + if(event.val==KM_PRESS && (evt->ctrl || evt->shift || evt->oskey)) event.alt= evt->alt = 3; // define? } else if (event.type==COMMANDKEY) { - event.oskey= evt->oskey= event.val; - if(event.val && (evt->ctrl || evt->alt || evt->shift)) + event.oskey= evt->oskey= (event.val==KM_PRESS); + if(event.val==KM_PRESS && (evt->ctrl || evt->alt || evt->shift)) event.oskey= evt->oskey = 3; // define? } -- cgit v1.2.3