diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-04-24 16:02:39 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-04-24 16:02:39 +0400 |
| commit | 4d29aee14011549f4be9145f1b0a3fc5ae5483ce (patch) | |
| tree | 902e5780606779c2d251a12604de70ce08c4c15a /source/blender/src/renderwin.c | |
| parent | 63048b6cf4358dc9231e0704e03e0f8d5729a174 (diff) | |
New: rendering in background mode (blender -b) now prints a percentage to
indicate scanlines being in progress. For motion blur frames it works too.
Bug fix: in background render it accidentally tried to free a sound pointer
that wasn't set. (caused by own commit of three days ago).
Fix: rendering motion blur in forground prints correct sample # in info-
header again.
Diffstat (limited to 'source/blender/src/renderwin.c')
| -rw-r--r-- | source/blender/src/renderwin.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 3ae049e0792..1d2db07f05a 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -666,7 +666,7 @@ static void renderview_progress_display_cb(int y1, int y2, int w, int h, unsigne /* callback for print info in top header in interface */ -static void printrenderinfo_cb(double time, int sample) +static void printrenderinfo_cb(double time, int sample, int blur) { extern int mem_in_use; float megs_used_memory= mem_in_use/(1024.0*1024.0); @@ -679,8 +679,11 @@ static void printrenderinfo_cb(double time, int sample) if (R.r.mode & R_FIELDS) { spos+= sprintf(spos, "Field %c ", (R.flag&R_SEC_FIELD)?'B':'A'); } + if (blur!=-1) { + spos+= sprintf(spos, "Blur: %d ", blur); + } if (sample!=-1) { - spos+= sprintf(spos, "Sample: %d ", sample); + spos+= sprintf(spos, "Sample: %d ", sample); } screen_draw_info_text(G.curscreen, str); |