[Bf-blender-cvs] [0b67102] master: Cycles: Code cleanup, whitespace

Sergey Sharybin noreply at git.blender.org
Fri Dec 5 18:15:52 CET 2014


Commit: 0b67102bd6be56edfefb66e2047b448fac0a152d
Author: Sergey Sharybin
Date:   Fri Dec 5 19:28:09 2014 +0500
Branches: master
https://developer.blender.org/rB0b67102bd6be56edfefb66e2047b448fac0a152d

Cycles: Code cleanup, whitespace

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

M	intern/cycles/blender/blender_session.cpp

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

diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 57ffea4..66d63d6 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -826,10 +826,8 @@ void BlenderSession::update_status_progress()
 	get_status(status, substatus);
 	get_progress(progress, total_time);
 
-	
-
 	if(background) {
-		if(progress>0)
+		if(progress > 0)
 			remaining_time = (1.0 - (double)progress) * (total_time / (double)progress);
 
 		scene += " | " + b_scene.name();
@@ -843,12 +841,12 @@ void BlenderSession::update_status_progress()
 		if(samples > 0 && total_samples != USHRT_MAX)
 			remaining_time = (total_samples - samples) * (total_time / samples);
 	}
-	
-	if(remaining_time>0) {
+
+	if(remaining_time > 0) {
 		BLI_timestr(remaining_time, time_str, sizeof(time_str));
 		timestatus += "Remaining:" + string(time_str) + " | ";
 	}
-	
+
 	timestatus += string_printf("Mem:%.2fM, Peak:%.2fM", (double)mem_used, (double)mem_peak);
 
 	if(status.size() > 0)




More information about the Bf-blender-cvs mailing list