diff options
author | Ton Roosendaal <ton@blender.org> | 2006-01-25 19:47:20 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-01-25 19:47:20 +0300 |
commit | 1cde5efa3d6676f94dfabb9206a145e837d380ef (patch) | |
tree | 7fde9f842c2ba23c92b7ac57116b265631adc78e /source/blender/render | |
parent | 9da89615139451e9b58d986c7bfbcd7ba2fe28a1 (diff) |
Orange:
- Missing free in AVI writing
- time counter for animation render wasn't reset to zero on successive
renders.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index baef27761ed..1cbe6273757 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -775,6 +775,9 @@ static void do_render_fields(Render *re) static void do_render_final(Render *re, Scene *scene) { + /* we set start time here, for main Blender loops */ + re->i.starttime= PIL_check_seconds_timer(); + if(re->r.scemode & R_DOSEQ) { re->result->rect32= MEM_callocN(sizeof(int)*re->rectx*re->recty, "rectot"); if(!re->test_break()) @@ -952,11 +955,15 @@ void RE_BlenderAnim(Render *re, Scene *scene, int sfra, int efra) /* write movie or image */ if(BKE_imtype_is_movie(scene->r.imtype)) { + /* note; the way it gets 32 bits rects is weak... */ + int dofree=0; if(rres.rect32==NULL) { rres.rect32= MEM_mallocN(sizeof(int)*rres.rectx*rres.recty, "temp 32 bits rect"); + dofree= 1; } RE_ResultGet32(re, rres.rect32); mh->append_movie(scene->r.cfra, rres.rect32, rres.rectx, rres.recty); + if(dofree) MEM_freeN(rres.rect32); printf("Append frame %d", scene->r.cfra); } else { |