kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T57305: NDOF frozen w/ lock view to camera

Browse Source 
This effectively reverts 030297209f2508a and 785e8a636a2939,
which caused this issue.
This commit is contained in:
Campbell Barton 2019-03-13 22:18:22 +11:00
parent 52d31b4894
commit 3afc77655e
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_System.cpp
View File

@ -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) {

9
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@ -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;