diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-04 20:11:44 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-04 20:11:44 +0400 |
| commit | eefdeebae5bae388054529d1e42615d73ef4a2de (patch) | |
| tree | a373a67b3004442e8b95a15ff40ac550cb5e5c18 /intern | |
| parent | d7d8c668ca78bf2e4f3a7a825db8e5b197d7a4b7 (diff) | |
Fix #30710: cycles wrong render time after pause/unpause in viewport.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/session.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 504e0b1f5bf..676f42be790 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -164,7 +164,7 @@ void Session::run_gpu() paused_time = 0.0; if(!params.background) - progress.set_start_time(start_time - paused_time); + progress.set_start_time(start_time + paused_time); while(!progress.get_cancel()) { /* advance to next tile */ @@ -191,7 +191,7 @@ void Session::run_gpu() paused_time += time_dt() - pause_start; if(!params.background) - progress.set_start_time(start_time - paused_time); + progress.set_start_time(start_time + paused_time); update_status_time(pause, no_tiles); progress.set_update(); @@ -340,7 +340,7 @@ void Session::run_cpu() paused_time += time_dt() - pause_start; if(!params.background) - progress.set_start_time(start_time - paused_time); + progress.set_start_time(start_time + paused_time); update_status_time(pause, no_tiles); progress.set_update(); @@ -473,7 +473,7 @@ void Session::reset_(BufferParams& buffer_params, int samples) sample = 0; if(!params.background) - progress.set_start_time(start_time - paused_time); + progress.set_start_time(start_time + paused_time); } void Session::reset(BufferParams& buffer_params, int samples) |