[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51080] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: Fix related to #32734: crash saving blend file from render_pre callback.
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Oct 5 14:18:07 CEST 2012
Revision: 51080
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51080
Author: blendix
Date: 2012-10-05 12:18:07 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Fix related to #32734: crash saving blend file from render_pre callback. Not
sure I want to recommend anyone doing this, but the fix is simple.
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c 2012-10-05 12:18:04 UTC (rev 51079)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c 2012-10-05 12:18:07 UTC (rev 51080)
@@ -56,6 +56,7 @@
#include "BLI_blenlib.h"
#include "BLI_linklist.h"
#include "BLI_utildefines.h"
+#include "BLI_threads.h"
#include "BLI_callbacks.h"
#include "BLF_translation.h"
@@ -794,7 +795,7 @@
/* blend file thumbnail */
/* save before exit_editmode, otherwise derivedmeshes for shared data corrupt #27765) */
- if (U.flag & USER_SAVE_PREVIEWS) {
+ if ((U.flag & USER_SAVE_PREVIEWS) && BLI_thread_is_main()) {
ibuf_thumb = blend_file_thumb(CTX_data_scene(C), CTX_wm_screen(C), &thumb);
}
More information about the Bf-blender-cvs
mailing list