From 3afc77655e94aea3ba56ca71cee2f89ec640dc2b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 13 Mar 2019 22:18:22 +1100 Subject: Fix T57305: NDOF frozen w/ lock view to camera This effectively reverts 030297209f2508a and 785e8a636a2939, which caused this issue. --- intern/ghost/intern/GHOST_System.cpp | 2 -- intern/ghost/intern/GHOST_SystemWin32.cpp | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'intern/ghost') diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index 5a3a745267c..80ef3a6fdc2 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -211,12 +211,10 @@ 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 ab451f1d586..a82d54470af 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -435,14 +435,8 @@ bool GHOST_SystemWin32::processEvents(bool waitForEvent) // Needed for MapVirtualKey or if we ever need to get chars from wm_ime_char or similar. ::TranslateMessage(&msg); ::DispatchMessageW(&msg); + hasEventHandled = true; } - - if (hasEventHandled == false) { - // Check if we have events handled by the system - // (for example the `GHOST_kEventWindowClose`). - hasEventHandled = m_eventManager->getNumEvents() != 0; - } - } while (waitForEvent && !hasEventHandled); return hasEventHandled; @@ -1105,7 +1099,6 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, #ifdef WITH_INPUT_NDOF case RIM_TYPEHID: if (system->processNDOF(raw)) { - system->m_ndofManager->sendMotionEvent(); eventHandled = true; } break; -- cgit v1.2.3