[Bf-blender-cvs] [60592f6778] master: Fix T50748: Render Time incorrect when refreshing rendered preview in GPU mode

[Sergey Sharybin]

Commit: 60592f67781ebf1a73402241a4ebb5d9e4b95d91
Author: Sergey Sharybin
Date:   Thu Feb 23 10:50:46 2017 +0100
Branches: master
https://developer.blender.org/rB60592f67781ebf1a73402241a4ebb5d9e4b95d91

Fix T50748: Render Time incorrect when refreshing rendered preview in GPU mode

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

M	intern/cycles/render/session.cpp

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

diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 7c01934cfd..420866c943 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -230,7 +230,9 @@ void Session::run_gpu()
 				while(1) {
 					scoped_timer pause_timer;
 					pause_cond.wait(pause_lock);
-					progress.add_skip_time(pause_timer, params.background);
+					if(pause) {
+						progress.add_skip_time(pause_timer, params.background);
+					}
 
 					update_status_time(pause, no_tiles);
 					progress.set_update();
@@ -520,7 +522,9 @@ void Session::run_cpu()
 				while(1) {
 					scoped_timer pause_timer;
 					pause_cond.wait(pause_lock);
-					progress.add_skip_time(pause_timer, params.background);
+					if(pause) {
+						progress.add_skip_time(pause_timer, params.background);
+					}
 
 					update_status_time(pause, no_tiles);
 					progress.set_update();