diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-16 16:47:37 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-16 16:47:37 +0400 |
commit | c4e029a274b04ec6adb5e16a6c1ee5bea67fa01e (patch) | |
tree | 1220a89a37e155f8004950b421d81cd48d8d2bf1 /source/blender | |
parent | 391f40e8c9647c2c436ef8681061d57300d2f287 (diff) |
Fix #29287: cycles and other external render engines did not print correct frame
number in background render.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 7 | ||||
-rw-r--r-- | source/blender/render/intern/source/external_engine.c | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index cc1c8843015..6931b0b86db 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -322,10 +322,13 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str) spos+= sprintf(spos, "%s ", rs->statstr); } else { - spos+= sprintf(spos, "Fra:%d Ve:%d Fa:%d ", (scene->r.cfra), rs->totvert, rs->totface); + spos+= sprintf(spos, "Fra:%d ", (scene->r.cfra)); + if(rs->totvert) spos+= sprintf(spos, "Ve:%d ", rs->totvert); + if(rs->totface) spos+= sprintf(spos, "Fa:%d ", rs->totface); if(rs->tothalo) spos+= sprintf(spos, "Ha:%d ", rs->tothalo); if(rs->totstrand) spos+= sprintf(spos, "St:%d ", rs->totstrand); - spos+= sprintf(spos, "La:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->totlamp, megs_used_memory, mmap_used_memory, megs_peak_memory); + if(rs->totlamp) spos+= sprintf(spos, "La:%d ", rs->totlamp); + spos+= sprintf(spos, "Mem:%.2fM (%.2fM, peak %.2fM) ", megs_used_memory, mmap_used_memory, megs_peak_memory); if(rs->curfield) spos+= sprintf(spos, "Field %d ", rs->curfield); diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index b7f89e260a8..38ace8d5121 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -283,6 +283,11 @@ int RE_engine_render(Render *re, int do_all) if(re->result==NULL) return 1; + /* set render info */ + re->i.cfra= re->scene->r.cfra; + BLI_strncpy(re->i.scenename, re->scene->id.name+2, sizeof(re->i.scenename)); + re->i.totface=re->i.totvert=re->i.totstrand=re->i.totlamp=re->i.tothalo= 0; + /* render */ engine = RE_engine_create(type); engine->re= re; |