diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 02:41:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-25 02:41:24 +0400 |
| commit | 0309f442bb232410e4c7594fa659238bd3854127 (patch) | |
| tree | 12bb9fc2ccf814c17bd1dc3befd816e2201c7c41 /intern/cycles/render/session.cpp | |
| parent | 898b49f7530e860a9accc4bb5ad897d12c55ef02 (diff) | |
Render stats text: show elapsed time for blender internal, hide useless "Single Layer"
at the start, more clearly indicate what the render time of the last frame was, some
other tweaks for consistency.
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 44364418dcf..d13e86429d6 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -791,12 +791,16 @@ void Session::update_status_time(bool show_pause, bool show_done) else substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples); - if(show_pause) + if(show_pause) { status = "Paused"; - else if(show_done) + } + else if(show_done) { status = "Done"; - else - status = "Rendering"; + } + else { + status = substatus; + substatus = ""; + } progress.set_status(status, substatus); |