[Bf-blender-cvs] [5051e580e40] master: Merge branch 'blender2.7'

[Jeroen Bakker]

Commit: 5051e580e4028e0a741e6519e469321a7e1f2a71
Author: Jeroen Bakker
Date:   Fri Mar 15 16:28:33 2019 +0100
Branches: master
https://developer.blender.org/rB5051e580e4028e0a741e6519e469321a7e1f2a71

Merge branch 'blender2.7'

===================================================================



===================================================================

diff --cc intern/cycles/blender/blender_session.cpp
index 501e4fec13f,27541800804..f1cdda5cb13
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@@ -1005,8 -956,8 +1010,8 @@@ void BlenderSession::update_bake_progre
  
  void BlenderSession::update_status_progress()
  {
- 	string timestatus, status, substatus;
+ 	string timestatus, status, substatus, kernel_status;
 -	string scene = "";
 +	string scene_status = "";
  	float progress;
  	double total_time, remaining_time = 0, render_time;
  	char time_str[128];
@@@ -1020,25 -972,31 +1026,27 @@@
  		remaining_time = (1.0 - (double)progress) * (render_time / (double)progress);
  
  	if(background) {
 -		scene += " | " + b_scene.name();
 +		scene_status += " | " + scene->name;
  		if(b_rlay_name != "")
 -			scene += ", "  + b_rlay_name;
 +			scene_status += ", "  + b_rlay_name;
  
  		if(b_rview_name != "")
 -			scene += ", " + b_rview_name;
 -	}
 -	else {
 -		BLI_timecode_string_from_time_simple(time_str, sizeof(time_str), total_time);
 -		timestatus = "Time:" + string(time_str) + " | ";
 -	}
 +			scene_status += ", " + b_rview_name;
  
 -	if(remaining_time > 0) {
 -		BLI_timecode_string_from_time_simple(time_str, sizeof(time_str), remaining_time);
 -		timestatus += "Remaining:" + string(time_str) + " | ";
 -	}
 +		if(remaining_time > 0) {
 +			BLI_timecode_string_from_time_simple(time_str, sizeof(time_str), remaining_time);
 +			timestatus += "Remaining:" + string(time_str) + " | ";
 +		}
  
 -	timestatus += string_printf("Mem:%.2fM, Peak:%.2fM", (double)mem_used, (double)mem_peak);
 +		timestatus += string_printf("Mem:%.2fM, Peak:%.2fM", (double)mem_used, (double)mem_peak);
  
 -	if(status.size() > 0)
 -		status = " | " + status;
 -	if(substatus.size() > 0)
 -		status += " | " + substatus;
 -	if(kernel_status.size() > 0)
 -		status += " | " + kernel_status;
 +		if(status.size() > 0)
 +			status = " | " + status;
 +		if(substatus.size() > 0)
 +			status += " | " + substatus;
++		if(kernel_status.size() > 0)
++			status += " | " + kernel_status;
 +	}
  
  	double current_time = time_dt();
  	/* When rendering in a window, redraw the status at least once per second to keep the elapsed and remaining time up-to-date.