don't write file history in backgound mode (running ctest would overwrite all my...
authorCampbell Barton <ideasman42@gmail.com>
Wed, 8 Jun 2011 01:53:12 +0000 (01:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 8 Jun 2011 01:53:12 +0000 (01:53 +0000)
CMakeLists.txt
source/blender/windowmanager/intern/wm_files.c

index 4f99136..c5e5258 100644 (file)
@@ -188,6 +188,9 @@ if(APPLE)
        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 @@ if(WITH_PYTHON_MODULE AND WITH_PYTHON_INSTALL)
        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)
index 5d005e2..c088d0d 100644 (file)
@@ -747,7 +747,10 @@ int WM_write_file(bContext *C, const char *target, int fileflags, ReportList *re
                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) {