[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39828] trunk/blender/intern/ghost/intern: making carbon to build again (note: NDOF is not working here)

Dalai Felinto dfelinto at gmail.com
Thu Sep 1 02:03:21 CEST 2011


Revision: 39828
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39828
Author:   dfelinto
Date:     2011-09-01 00:03:20 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
making carbon to build again (note: NDOF is not working here)
- fix typo
- isolate NDOF callsi in #ifdefs

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_ISystemPaths.cpp
    trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_ISystemPaths.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_ISystemPaths.cpp	2011-08-31 23:46:31 UTC (rev 39827)
+++ trunk/blender/intern/ghost/intern/GHOST_ISystemPaths.cpp	2011-09-01 00:03:20 UTC (rev 39828)
@@ -70,7 +70,7 @@
 #		ifdef GHOST_COCOA
 			m_systemPaths = new GHOST_SystemPathsCocoa ();
 #		else
-			m_systemPaths = new GHOST_SystemPathsarbon ();
+			m_systemPaths = new GHOST_SystemPathsCarbon ();
 #		endif
 #	else 
 		m_systemPaths = new GHOST_SystemPathsX11 ();

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp	2011-08-31 23:46:31 UTC (rev 39827)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp	2011-09-01 00:03:20 UTC (rev 39828)
@@ -48,7 +48,9 @@
 #include "GHOST_EventButton.h"
 #include "GHOST_EventCursor.h"
 #include "GHOST_EventWheel.h"
+#ifdef WITH_INPUT_NDOF
 #include "GHOST_EventNDOF.h"
+#endif
 
 #include "GHOST_TimerManager.h"
 #include "GHOST_TimerTask.h"
@@ -1101,7 +1103,9 @@
 	GHOST_SystemCarbon* sys = (GHOST_SystemCarbon*) userData;
     OSStatus err = eventNotHandledErr;
 	GHOST_IWindow* window;
+#ifdef WITH_INPUT_NDOF
 	GHOST_TEventNDOFData data;
+#endif
 	UInt32 kind;
 	
     switch (::GetEventClass(event))
@@ -1122,6 +1126,7 @@
 			err = sys->handleKeyEvent(event);
 			break;
  		case kEventClassBlender :
+#ifdef WITH_INPUT_NDOF
 			window = sys->m_windowManager->getActiveWindow();
 			sys->m_ndofManager->GHOST_NDOFGetDatas(data);
 			kind = ::GetEventKind(event);
@@ -1137,6 +1142,7 @@
 //					printf("button\n");
 					break;
 			}
+#endif
 			err = noErr;
 			break;
 		default : 




More information about the Bf-blender-cvs mailing list