diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-04 14:46:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-04 14:46:54 +0300 |
commit | 3447944c3f6a9afdf608c10033f090b11c15753c (patch) | |
tree | 5ac781882e82d9741a9c66044757877d1cdb47c1 /source/blender/render | |
parent | 44e02651ab369772db492e1c58e7a8860d092df2 (diff) |
sequencer: don't return big values (fill pointer instead)
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 1f17b82da3b..87961c03ed2 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2379,6 +2379,7 @@ static void do_render_seq(Render *re) RenderResult *rr; /* don't assign re->result here as it might change during give_ibuf_seq */ int cfra = re->r.cfra; SeqRenderData context; + int re_x, re_y; re->i.cfra = cfra; @@ -2392,14 +2393,19 @@ static void do_render_seq(Render *re) if ((re->r.mode & R_BORDER) && (re->r.mode & R_CROP) == 0) { /* if border rendering is used and cropping is disabled, final buffer should * be as large as the whole frame */ - context = BKE_sequencer_new_render_data(re->eval_ctx, re->main, re->scene, - re->winx, re->winy, 100); + re_x = re->winx; + re_y = re->winy; } else { - context = BKE_sequencer_new_render_data(re->eval_ctx, re->main, re->scene, - re->result->rectx, re->result->recty, 100); + re_x = re->result->rectx; + re_y = re->result->recty; } + BKE_sequencer_new_render_data( + re->eval_ctx, re->main, re->scene, + re_x, re_y, 100, + &context); + out = BKE_sequencer_give_ibuf(&context, cfra, 0); if (out) { |