sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #30710: cycles wrong render time after pause/unpause in viewport.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-04-04 16:11:44 +00:00
parent d7d8c668ca
commit eefdeebae5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/render/session.cpp
View File

@ -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)