[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43965] trunk/blender/intern/cycles/ blender/blender_session.cpp: Fix #30086: cycles background render printing same status text twice.
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Feb 7 18:22:59 CET 2012
Revision: 43965
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43965
Author: blendix
Date: 2012-02-07 17:22:47 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Fix #30086: cycles background render printing same status text twice.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_session.cpp
Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp 2012-02-07 17:11:56 UTC (rev 43964)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp 2012-02-07 17:22:47 UTC (rev 43965)
@@ -394,7 +394,7 @@
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 @@
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) {
More information about the Bf-blender-cvs
mailing list