diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-21 13:36:36 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-21 13:36:36 +0400 |
commit | e1d1cc0680af2705c0cc84d99cb5a25da328a861 (patch) | |
tree | 4458c57e8cc1ce1cb4c38f103ebc023363536865 /source/blender/blenkernel/intern/sequencer.c | |
parent | e6449a5c2cecf4b97f3ad7805a2b0087ceefeaa8 (diff) |
Fix #33253: VSE preview doesn't display compositor
There were two issues in scene strip rendering:
- It will skip rendering if scene doesn't have camera but uses compositor
- G.is_break will cancel preview rendering
Also removed Use Sequencer from scene's strip settings, it's not supported.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 547ca96e10a..4493b5c7ff9 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2343,6 +2343,7 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float (context.scene->r.seq_flag & R_SEQ_GL_PREV); int do_seq; int have_seq = FALSE; + int have_comp = FALSE; Scene *scene; int is_thread_main = BLI_thread_is_main(); @@ -2355,6 +2356,7 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float frame = scene->r.sfra + nr + seq->anim_startofs; have_seq = (scene->r.scemode & R_DOSEQ) && scene->ed && scene->ed->seqbase.first; + have_comp = (scene->r.scemode & R_DOCOMP) && scene->use_nodes && scene->nodetree; oldcfra = scene->r.cfra; scene->r.cfra = frame; @@ -2367,7 +2369,7 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float camera = scene->camera; } - if (have_seq == FALSE && camera == NULL) { + if (have_comp == FALSE && camera == NULL) { scene->r.cfra = oldcfra; return NULL; } |