diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-22 15:45:39 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-22 15:45:39 +0400 |
commit | 13e528240ceb8e43ce8c57aebfd8f8df14fc2d87 (patch) | |
tree | d1ec21edd47dae6ce24b321a743c371e815e5b6d /source/blender/blenkernel/intern/sequencer.c | |
parent | b3b3d00e062fa032cf1b7ba2eb537d4688868872 (diff) |
Fix #33263: Sequencer Command Line Bugs
Was own regressions since recursive sequencer commit.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 4493b5c7ff9..249a3e58aff 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2338,6 +2338,7 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float */ const short is_rendering = G.is_rendering; + const short is_background = G.background; const int do_seq_gl = G.is_rendering ? 0 /* (context.scene->r.seq_flag & R_SEQ_GL_REND) */ : (context.scene->r.seq_flag & R_SEQ_GL_PREV); @@ -2409,8 +2410,11 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float * * disable rendered preview for sequencer while rendering -- it's very much possible * that preview render will went into conflict with final render + * + * When rendering from command line renderer is called from main thread, in this + * case it's always safe to render scene here */ - if (!is_thread_main || is_rendering == FALSE) { + if (!is_thread_main || is_rendering == FALSE || is_background) { if (re == NULL) re = RE_NewRender(scene->id.name); |