archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T54799: NDOF events not dispatched on windows.

Browse Source 
Caused by commit rB785e8a636a29
This commit is contained in:
Germano Cavalcante
2018-08-07 11:41:55 -03:00
parent 4c712fd17e
commit 030297209f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,10 +219,12 @@ bool GHOST_System::getFullScreen(void)
void GHOST_System::dispatchEvents() void GHOST_System::dispatchEvents()
{ {
#ifdef WITH_INPUT_NDOF #ifdef WITH_INPUT_NDOF
#ifndef WIN32
// NDOF Motion event is sent only once per dispatch, so do it now: // NDOF Motion event is sent only once per dispatch, so do it now:
if (m_ndofManager) { if (m_ndofManager) {
m_ndofManager->sendMotionEvent(); m_ndofManager->sendMotionEvent();
} }
#endif
#endif #endif
if (m_eventManager) { if (m_eventManager) {

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

@@ -1110,8 +1110,10 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
break; break;
#ifdef WITH_INPUT_NDOF #ifdef WITH_INPUT_NDOF
case RIM_TYPEHID: case RIM_TYPEHID:
if (system->processNDOF(raw)) if (system->processNDOF(raw)) {
system->m_ndofManager->sendMotionEvent();
eventHandled = true; eventHandled = true;
}
break; break;
#endif #endif
} }