diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-12 00:28:47 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-12 00:28:47 +0400 |
commit | c785d7493ea72797afd369152e929f80f88795ae (patch) | |
tree | 9758fc7dd8a1b902603c79ec34eaa5680b3ecbe4 /intern | |
parent | fd9ad582983939741a4c4fa5f2707f29365d6c09 (diff) | |
parent | 96486b356f7d035a7abc835adbef850c3f314264 (diff) |
soc-2008-mxcurioni: merged changes to revision 14798, compilation works for rendering/ directry. Still needs to figure out how to compile on non-Unix machines.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_System.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp index 6f3876c1d96..2426146184a 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.cpp +++ b/intern/ghost/intern/GHOST_NDOFManager.cpp @@ -73,7 +73,9 @@ GHOST_NDOFManager::deviceOpen(GHOST_IWindow* window, if (ndofLibraryInit && ndofDeviceOpen) { Pid= ndofLibraryInit(); +#if 0 printf("%i client \n", Pid); +#endif #if defined(_WIN32) || defined(__APPLE__) m_DeviceHandle = ndofDeviceOpen((void *)¤tNdofValues); #else diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index 458a35bf34b..87e5f375958 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -283,9 +283,11 @@ GHOST_TSuccess GHOST_System::init() m_eventManager = new GHOST_EventManager (); m_ndofManager = new GHOST_NDOFManager(); +#if 0 if(m_ndofManager) printf("ndof manager \n"); - +#endif + #ifdef GHOST_DEBUG if (m_eventManager) { m_eventManager->addConsumer(&m_eventPrinter); |