diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-08 05:53:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-08 05:53:12 +0400 |
| commit | 42ece56e91db997425f010e2cf18c9021113f5e7 (patch) | |
| tree | a5b661d794d717e4345a305eed6386126ec28085 | |
| parent | 7fd1fe9fc8e3154c36a57ed2c69409d526ee1171 (diff) | |
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.
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f99136097c..c5e5258e062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 5d005e23029..c088d0d2d43 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -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) { |