[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53633] trunk/blender/source/blender/ editors/space_sequencer/sequencer_draw.c: Fix #33735: sequencer crash when using rendered preview
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jan 7 15:25:29 CET 2013
Revision: 53633
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53633
Author: nazgul
Date: 2013-01-07 14:25:29 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Fix #33735: sequencer crash when using rendered preview
Issue was caused by preview job starting just moment before
sequencer starts rendering. This lead to threading conflicts
since renderer itself is not thread-safe.
Now all preview jobs would be killed before sequencer starts
rendering stack when final render for preview is enabled.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2013-01-07 14:25:26 UTC (rev 53632)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2013-01-07 14:25:29 UTC (rev 53633)
@@ -929,6 +929,13 @@
* needed to make so sequencer's rendering doesn't conflict with compositor
*/
WM_jobs_kill_type(CTX_wm_manager(C), WM_JOB_TYPE_COMPOSITE);
+
+ if ((scene->r.seq_flag & R_SEQ_GL_PREV) == 0) {
+ /* in case of final rendering used for preview, kill all previews,
+ * otherwise threading conflict will happen in rendering module
+ */
+ WM_jobs_kill_type(CTX_wm_manager(C), WM_JOB_TYPE_RENDER_PREVIEW);
+ }
}
render_size = sseq->render_size;
More information about the Bf-blender-cvs
mailing list