[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48561] branches/soc-2011-tomato/source/ blender/windowmanager/intern/wm_playanim.c: make the last fix unhackish

jens verwiebe info at jensverwiebe.de
Tue Jul 3 21:40:02 CEST 2012


Revision: 48561
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48561
Author:   jensverwiebe
Date:     2012-07-03 19:40:01 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
make the last fix unhackish

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c

Modified: branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c	2012-07-03 19:12:20 UTC (rev 48560)
+++ branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c	2012-07-03 19:40:01 UTC (rev 48561)
@@ -813,7 +813,7 @@
 	}
 
 #ifdef WITH_QUICKTIME
-#if defined(_WIN32) // || defined(__APPLE__)
+#if defined(_WIN32) || defined(__APPLE__) && !defined(GHOST_COCOA)
 	/* Initialize QuickTime */
 #ifndef noErr
 #define noErr 0
@@ -828,7 +828,7 @@
 	if (EnterMovies() != noErr)
 		G.have_quicktime = FALSE;
 	else
-#endif /* _WIN32 //|| __APPLE__ */
+#endif /* _WIN32 || __APPLE__  && !defined(GHOST_COCOA)*/
 	G.have_quicktime = TRUE;
 #endif /* WITH_QUICKTIME */
 
@@ -1066,14 +1066,14 @@
 		ps.picture = ps.picture->next;
 	}
 #ifdef WITH_QUICKTIME
-#if defined(_WIN32) // || defined(__APPLE__)
+#if defined(_WIN32) || defined(__APPLE__) && !defined(GHOST_COCOA)
 	if (G.have_quicktime) {
 		ExitMovies();
 #ifdef _WIN32
 		TerminateQTML();
 #endif /* _WIN32 */
 	}
-#endif /* _WIN32 // || __APPLE__ */
+#endif /* _WIN32 || __APPLE__ && !defined(GHOST_COCOA) */
 #endif /* WITH_QUICKTIME */
 
 	/* cleanup */




More information about the Bf-blender-cvs mailing list