diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-10 20:11:12 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-10 20:11:12 +0400 |
| commit | f6f33515ac62fb603ceba0eeaf79047b4451f754 (patch) | |
| tree | 4c450dfd6e36befb468690658b4decef2f07a6a5 /source | |
| parent | 1c99e6aa0b79403d83325eb831e2efab6ae4e255 (diff) | |
Fix #33822: Compositor gets stuck if a sequencer window is also visible
Issue was caused by a fix for rendered sequencer preview mode, which
will likely conflict with compositor job. Made it so compositor job
will be killed when sequencer uses rendered preview.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 9477b3197fa..249ba986fd3 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -924,7 +924,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq void *cache_handle = NULL; const int is_imbuf = ED_space_sequencer_check_show_imbuf(sseq); - if (G.is_rendering == FALSE) { + if (G.is_rendering == FALSE && (scene->r.seq_flag & R_SEQ_GL_PREV) == 0) { /* stop all running jobs, except screen one. currently previews frustrate Render * needed to make so sequencer's rendering doesn't conflict with compositor */ |