[Bf-blender-cvs] [b95645c1ae] blender-v2.78c-release: Fix T50748: Render Time incorrect when refreshing rendered preview in GPU mode
Sergey Sharybin
noreply at git.blender.org
Thu Feb 23 16:08:56 CET 2017
Commit: b95645c1aec371be44460c82d3b559647b1a4491
Author: Sergey Sharybin
Date: Thu Feb 23 10:50:46 2017 +0100
Branches: blender-v2.78c-release
https://developer.blender.org/rBb95645c1aec371be44460c82d3b559647b1a4491
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();
More information about the Bf-blender-cvs
mailing list