[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37309] trunk/blender: don' t write file history in backgound mode ( running ctest would overwrite all my recent-files.txt), and add an error about mingw/quicktime being unsupported.

Campbell Barton ideasman42 at gmail.com
Wed Jun 8 03:53:14 CEST 2011


Revision: 37309
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37309
Author:   campbellbarton
Date:     2011-06-08 01:53:12 +0000 (Wed, 08 Jun 2011)
Log Message:
-----------
don't write file history in backgound mode (running ctest would overwrite all my recent-files.txt), and add an error about mingw/quicktime being unsupported.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-06-07 23:12:58 UTC (rev 37308)
+++ trunk/blender/CMakeLists.txt	2011-06-08 01:53:12 UTC (rev 37309)
@@ -188,6 +188,9 @@
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
 endif()
 
+#-----------------------------------------------------------------------------
+# Check for conflicting/unsupported configurations
+
 if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
@@ -209,6 +212,12 @@
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
+if(WITH_CODEC_QUICKTIME AND MINGW)
+	message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+						"because it is currently unsupported, remove this "
+						"line if youre a developer who wants to add support.")
+endif()
+
 # may as well build python module without a UI
 if(WITH_PYTHON_MODULE)
 	set(WITH_HEADLESS ON)

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-06-07 23:12:58 UTC (rev 37308)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-06-08 01:53:12 UTC (rev 37309)
@@ -747,7 +747,10 @@
 		if(fileflags & G_FILE_AUTOPLAY) G.fileflags |= G_FILE_AUTOPLAY;
 		else G.fileflags &= ~G_FILE_AUTOPLAY;
 
-		write_history();
+		/* prevent background mode scripts from clobbering history */
+		if(!G.background) {
+			write_history();
+		}
 
 		/* run this function after because the file cant be written before the blend is */
 		if (ibuf_thumb) {




More information about the Bf-blender-cvs mailing list