forked from bartvdbraak/blender
Fix [#21257] Renders blank images when audio clip is present.
Only render sequencer when there are non-audio strips on the timeline.
This commit is contained in:
parent
c960dc9401
commit
7efe41bc22
@ -2403,6 +2403,24 @@ static void renderresult_stampinfo(Scene *scene)
|
|||||||
RE_ReleaseResultImage(re);
|
RE_ReleaseResultImage(re);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int seq_render_active(Render *re)
|
||||||
|
{
|
||||||
|
Editing *ed;
|
||||||
|
Sequence *seq;
|
||||||
|
|
||||||
|
ed = re->scene->ed;
|
||||||
|
|
||||||
|
if (!(re->r.scemode & R_DOSEQ) || !ed || !ed->seqbase.first)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
for (seq= ed->seqbase.first; seq; seq= seq->next) {
|
||||||
|
if (seq->type != SEQ_SOUND)
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static void do_render_seq(Render * re)
|
static void do_render_seq(Render * re)
|
||||||
{
|
{
|
||||||
static int recurs_depth = 0;
|
static int recurs_depth = 0;
|
||||||
@ -2484,7 +2502,7 @@ static void do_render_all_options(Render *re)
|
|||||||
if(external_render_3d(re, 1)) {
|
if(external_render_3d(re, 1)) {
|
||||||
/* in this case external render overrides all */
|
/* in this case external render overrides all */
|
||||||
}
|
}
|
||||||
else if((re->r.scemode & R_DOSEQ) && re->scene->ed && re->scene->ed->seqbase.first) {
|
else if(seq_render_active(re)) {
|
||||||
/* note: do_render_seq() frees rect32 when sequencer returns float images */
|
/* note: do_render_seq() frees rect32 when sequencer returns float images */
|
||||||
if(!re->test_break(re->tbh))
|
if(!re->test_break(re->tbh))
|
||||||
do_render_seq(re);
|
do_render_seq(re);
|
||||||
|
Loading…
Reference in New Issue
Block a user