[Bf-blender-cvs] [030297209f2] blender2.8: Fix T54799: NDOF events not dispatched on windows.
mano-wii
noreply at git.blender.org
Tue Aug 7 16:42:07 CEST 2018
Commit: 030297209f2508a704b8851fa5d7d9a6696561b5
Author: mano-wii
Date: Tue Aug 7 11:41:55 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB030297209f2508a704b8851fa5d7d9a6696561b5
Fix T54799: NDOF events not dispatched on windows.
Caused by commit rB785e8a636a29
===================================================================
M intern/ghost/intern/GHOST_System.cpp
M intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
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
}
More information about the Bf-blender-cvs
mailing list