diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-07 18:25:29 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-07 18:25:29 +0400 |
| commit | 1f70a30bd74c3fd2616479b0e8aa4a1c0dda3019 (patch) | |
| tree | cd1dbe1a34736e2255a6116d1186e2b038c6ea34 /source/blender/editors/space_sequencer | |
| parent | d22c8cfca39d3f55447bc54870f6984edf1ae3c2 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index e3db9c23c41..9e55d95637d 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -929,6 +929,13 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq * 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; |