diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-07 21:22:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-07 21:22:47 +0400 |
| commit | b67b1c8564cedfc425892f6b071210b724366523 (patch) | |
| tree | a40c5499b9069157f59bbd86f2d98ba64d36a2a2 /intern/cycles/blender/blender_session.cpp | |
| parent | dc72e792742ed36abf31a19cd0eac2949f5debf6 (diff) | |
Fix #30086: cycles background render printing same status text twice.
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index d9adc5480dc..5ea3f2ce16e 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -394,7 +394,7 @@ void BlenderSession::get_progress(float& progress, double& total_time) void BlenderSession::update_status_progress() { - string status, substatus; + string timestatus, status, substatus; float progress; double total_time; char time_str[128]; @@ -403,13 +403,13 @@ void BlenderSession::update_status_progress() get_progress(progress, total_time); BLI_timestr(total_time, time_str); - status = "Elapsed: " + string(time_str) + " | " + status; + timestatus = "Elapsed: " + string(time_str) + " | "; if(substatus.size() > 0) status += " | " + substatus; if(status != last_status) { - RE_engine_update_stats((RenderEngine*)b_engine.ptr.data, "", status.c_str()); + RE_engine_update_stats((RenderEngine*)b_engine.ptr.data, "", (timestatus + status).c_str()); last_status = status; } if(progress != last_progress) { |