Commit: b7ff6efaf28c15379eeb20c20363e38e465636e0
Author: TheOnlyJoey
Date: Thu Mar 17 17:24:45 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBb7ff6efaf28c15379eeb20c20363e38e465636e0
Fixed hmd event despatching for all operating systems
===================================================================
M intern/ghost/intern/GHOST_System.h
M intern/ghost/intern/GHOST_SystemCocoa.mm
M intern/ghost/intern/GHOST_SystemWin32.cpp
M intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
diff --git a/intern/ghost/intern/GHOST_System.h
b/intern/ghost/intern/GHOST_System.h
index 5912805..6c841b8 100644
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@ -184,7 +184,7 @@ public:
* Implemented for operating system independent event handling
*/
- virtual bool processEvents(bool waitForEvent);
+ bool processEvents(bool waitForEvent);
/**
* Dispatches all the events on the stack.
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 01cce84..87d0d74 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -731,7 +731,7 @@ bool GHOST_SystemCocoa::processEvents(bool waitForEvent)
[pool drain];
/* Call base class to update os independent events */
- GHOST_System::processEvents(false);
+ anyProcessed =
GHOST_System::processEvents(anyProcessed);
} while (event != nil);
#if 0
} while (waitForEvent && !anyProcessed); // Needed only for timer
implementation
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp
b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 0e232bf..62c548c 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -300,7 +300,7 @@ bool GHOST_SystemWin32::processEvents(bool waitForEvent)
}
/* Call base class to update os independent events */
- GHOST_System::processEvents(false);
+ anyProcessed = GHOST_System::processEvents(anyProcessed);
} while (waitForEvent && !anyProcessed);
return anyProcessed;
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp
b/intern/ghost/intern/GHOST_SystemX11.cpp
index b4e0031..0f75119 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -598,7 +598,7 @@ processEvents(
}
#endif
/* Call base class to update os independent events */
- GHOST_System::processEvents(false);
+ anyProcessed = GHOST_System::processEvents(anyProcessed);
} while (waitForEvent && !anyProcessed);
return anyProcessed;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
