diff options
author | Ton Roosendaal <ton@blender.org> | 2009-07-21 16:19:46 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-07-21 16:19:46 +0400 |
commit | e18164dbab59ae5c9f0f1dd1ba12d1a97538919b (patch) | |
tree | 6b34a81bb718187de71518043b09e02a1b2a88b3 | |
parent | ed921058573dca5277f062e992ad0db0393071fe (diff) |
2.5
Overlooked WM event.val usage without checking proper #defines.
My previous commit made all input not work on any modifier key press.
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 16 |
1 files changed, 8 insertions, 8 deletions
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? } |