diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-10-29 19:40:43 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-10-29 19:40:43 +0400 |
| commit | 76288fad8cb09567f31804536ba687997898b3e5 (patch) | |
| tree | c815781b4ba0cc207a8f60f33ff561b2aeb88a2e /source/blender/windowmanager/intern/wm_event_system.c | |
| parent | 37801c86f24ea62f7d3e68b2ec1f4a24fa6f225a (diff) | |
Fix to make NDoF work again.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_event_system.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 7bb4cdf5c40..81c2e28ed2d 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2818,11 +2818,10 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U else event.type = MIDDLEMOUSE; - /* copy prev state to event state */ -// if (event.val == KM_PRESS) { - evt->prevval = evt->val; - evt->prevtype = evt->type; -// } + /* copy previous state to prev event state (two old!) */ + evt->prevval = evt->val; + evt->prevtype = evt->type; + /* copy to event state */ evt->val = event.val; evt->type = event.type; @@ -2883,11 +2882,9 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U memcpy(event.utf8_buf, kd->utf8_buf, sizeof(event.utf8_buf)); /* might be not null terminated*/ event.val = (type == GHOST_kEventKeyDown) ? KM_PRESS : KM_RELEASE; - /* copy prev state to event state */ - //if (event.val == KM_PRESS) { - evt->prevval = evt->val; - evt->prevtype = evt->type; - //} + /* copy previous state to prev event state (two old!) */ + evt->prevval = evt->val; + evt->prevtype = evt->type; /* copy to event state */ evt->val = event.val; @@ -3015,6 +3012,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U case GHOST_kEventNDOFMotion: { event.type = NDOF_MOTION; + event.val = 0; attach_ndof_data(&event, customdata); wm_event_add(win, &event); |