diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-05 17:28:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-05 20:15:04 +0300 |
| commit | 0b67102bd6be56edfefb66e2047b448fac0a152d (patch) | |
| tree | 5262e547b018e9375783a97e75bbde0736c3ba2c /intern/cycles | |
| parent | e1e984e437fc8fdf4a0fa1f8ec8fb64748c4ea28 (diff) | |
Cycles: Code cleanup, whitespace
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 57ffea4b1a9..66d63d62067 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -826,10 +826,8 @@ void BlenderSession::update_status_progress() get_status(status, substatus); get_progress(progress, total_time); - - if(background) { - if(progress>0) + if(progress > 0) remaining_time = (1.0 - (double)progress) * (total_time / (double)progress); scene += " | " + b_scene.name(); @@ -843,12 +841,12 @@ void BlenderSession::update_status_progress() if(samples > 0 && total_samples != USHRT_MAX) remaining_time = (total_samples - samples) * (total_time / samples); } - - if(remaining_time>0) { + + if(remaining_time > 0) { BLI_timestr(remaining_time, time_str, sizeof(time_str)); timestatus += "Remaining:" + string(time_str) + " | "; } - + timestatus += string_printf("Mem:%.2fM, Peak:%.2fM", (double)mem_used, (double)mem_peak); if(status.size() > 0) |