diff options
| author | mano-wii <germano.costa@ig.com.br> | 2018-08-07 17:41:55 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2018-08-07 17:41:55 +0300 |
| commit | 030297209f2508a704b8851fa5d7d9a6696561b5 (patch) | |
| tree | ce7aeb68d7ed7dfe275b4429b61fa87cd6ef236a /intern/ghost | |
| parent | 4c712fd17eade91d1eac65edae09f39460ae60ea (diff) | |
Fix T54799: NDOF events not dispatched on windows.
Caused by commit rB785e8a636a29
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_System.cpp | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index c3fd87c65af..4a8a8c48018 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -219,10 +219,12 @@ bool GHOST_System::getFullScreen(void) void GHOST_System::dispatchEvents() { #ifdef WITH_INPUT_NDOF + #ifndef WIN32 // NDOF Motion event is sent only once per dispatch, so do it now: if (m_ndofManager) { m_ndofManager->sendMotionEvent(); } + #endif #endif if (m_eventManager) { diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 17c41e96be4..924173a6c68 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -1110,8 +1110,10 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, break; #ifdef WITH_INPUT_NDOF case RIM_TYPEHID: - if (system->processNDOF(raw)) + if (system->processNDOF(raw)) { + system->m_ndofManager->sendMotionEvent(); eventHandled = true; + } break; #endif } |