Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-11-16 16:47:37 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-11-16 16:47:37 +0400
commitc4e029a274b04ec6adb5e16a6c1ee5bea67fa01e (patch)
tree1220a89a37e155f8004950b421d81cd48d8d2bf1 /source/blender/editors/render/render_internal.c
parent391f40e8c9647c2c436ef8681061d57300d2f287 (diff)
Fix #29287: cycles and other external render engines did not print correct frame
number in background render.
Diffstat (limited to 'source/blender/editors/render/render_internal.c')
-rw-r--r--source/blender/editors/render/render_internal.c7
1 files changed, 5 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);