diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-05-24 15:40:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-05-24 15:40:45 +0400 |
| commit | 4178b44b353e51139954d4b954e9234cdc172507 (patch) | |
| tree | 1186f099370c575074126de16797c07260901efd /source/blender/render/intern/source/pipeline.c | |
| parent | 6c01b7b4f84b3a81836a372ec14e4ba6793b6ad9 (diff) | |
- correct --help message
- fix implicit decloration of DAG_scene_sort()
- same fix for tiff as made in renderbranch
- rename 'combined peak' --> 'peak' for shorter messages while rendering.
Diffstat (limited to 'source/blender/render/intern/source/pipeline.c')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 0f4cfb636da..e990331b3ca 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -149,7 +149,7 @@ static void stats_background(void *unused, RenderStats *rs) mmap_used_memory= (mmap_in_use)/(1024.0*1024.0); megs_peak_memory = (peak_memory)/(1024.0*1024.0); - spos+= sprintf(spos, "Fra:%d Mem:%.2fM (%.2fM, combined peak %.2fM) ", rs->cfra, + spos+= sprintf(spos, "Fra:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->cfra, megs_used_memory, mmap_used_memory, megs_peak_memory); if(rs->curfield) |