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/blenkernel/intern/sequencer.c | |
parent | 44e02651ab369772db492e1c58e7a8860d092df2 (diff) |
sequencer: don't return big values (fill pointer instead)
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 1344062a958..b43e481d97d 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -515,24 +515,22 @@ void BKE_sequencer_pixel_from_sequencer_space_v4(struct Scene *scene, float pixe /*********************** sequencer pipeline functions *************************/ -SeqRenderData BKE_sequencer_new_render_data(EvaluationContext *eval_ctx, - Main *bmain, Scene *scene, int rectx, int recty, - int preview_render_size) -{ - SeqRenderData rval; - - rval.bmain = bmain; - rval.scene = scene; - rval.rectx = rectx; - rval.recty = recty; - rval.preview_render_size = preview_render_size; - rval.motion_blur_samples = 0; - rval.motion_blur_shutter = 0; - rval.eval_ctx = eval_ctx; - rval.skip_cache = false; - rval.is_proxy_render = false; - - return rval; +void BKE_sequencer_new_render_data( + EvaluationContext *eval_ctx, + Main *bmain, Scene *scene, int rectx, int recty, + int preview_render_size, + SeqRenderData *r_context) +{ + r_context->eval_ctx = eval_ctx; + r_context->bmain = bmain; + r_context->scene = scene; + r_context->rectx = rectx; + r_context->recty = recty; + r_context->preview_render_size = preview_render_size; + r_context->motion_blur_samples = 0; + r_context->motion_blur_shutter = 0; + r_context->skip_cache = false; + r_context->is_proxy_render = false; } /* ************************* iterator ************************** */ @@ -1593,9 +1591,12 @@ void BKE_sequencer_proxy_rebuild(SeqIndexBuildContext *context, short *stop, sho /* fail safe code */ - render_context = BKE_sequencer_new_render_data(bmain->eval_ctx, bmain, context->scene, - (scene->r.size * (float) scene->r.xsch) / 100.0f + 0.5f, - (scene->r.size * (float) scene->r.ysch) / 100.0f + 0.5f, 100); + BKE_sequencer_new_render_data( + bmain->eval_ctx, bmain, context->scene, + (scene->r.size * (float) scene->r.xsch) / 100.0f + 0.5f, + (scene->r.size * (float) scene->r.ysch) / 100.0f + 0.5f, 100, + &render_context); + render_context.skip_cache = true; render_context.is_proxy_render = true; |