diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-23 12:50:46 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-02-23 12:51:06 +0300 |
| commit | 60592f67781ebf1a73402241a4ebb5d9e4b95d91 (patch) | |
| tree | 8bbf9d5b23b2375c96aa587125ed692b9d47cbff | |
| parent | 9dd194716b0f43fa02ae6cd32ada556d8d622390 (diff) | |
Fix T50748: Render Time incorrect when refreshing rendered preview in GPU mode
| -rw-r--r-- | intern/cycles/render/session.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 7c01934cfd8..420866c9436 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(); |