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.

1 files changed, 13 insertions, 7 deletions

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index ecdc631e39a..86bdbc0749f 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -616,16 +616,22 @@ void BlenderSession::update_status_progress()
 	get_status(status, substatus);
 	get_progress(progress, total_time);
 
-	timestatus = string_printf("Mem: %.2fM, Peak: %.2fM | ", mem_used, mem_peak);
+	timestatus = string_printf("Mem:%.2fM, Peak:%.2fM", mem_used, mem_peak);
 
-	timestatus += b_scene.name();
-	if(b_rlay_name != "")
-		timestatus += ", "  + b_rlay_name;
-	timestatus += " | ";
+	if(background) {
+		timestatus += " | " + b_scene.name();
+		if(b_rlay_name != "")
+			timestatus += ", "  + b_rlay_name;
+	}
+	else {
+		timestatus += " | ";
 
-	BLI_timestr(total_time, time_str, sizeof(time_str));
-	timestatus += "Elapsed: " + string(time_str) + " | ";
+		BLI_timestr(total_time, time_str, sizeof(time_str));
+		timestatus += "Time:" + string(time_str);
+	}
 
+	if(status.size() > 0)
+		status = " | " + status;
 	if(substatus.size() > 0)
 		status += " | " + substatus;