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

avoid divide by zero in cycles progress calculation

Browse Source
This commit is contained in:
Campbell Barton 2012-11-13 01:53:07 +00:00
parent 2243ab514a
commit 1c1e7a0237
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_session.cpp
View File

@ -518,8 +518,8 @@ void BlenderSession::get_progress(float& progress, double& total_time)
sample = session->progress.get_sample();
samples_per_tile = session->params.samples;
if(samples_per_tile)
progress = ((float)sample/(float)(tile_total * samples_per_tile));
if(samples_per_tile && tile_total)
progress = ((float)sample / (float)(tile_total * samples_per_tile));
else
progress = 0.0;
}

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

@ -757,7 +757,7 @@ void Session::update_status_time(bool show_pause, bool show_done)
if(preview_time == 0.0 && resolution == 1)
preview_time = time_dt();
double tile_time = (tile == 0)? 0.0: (time_dt() - preview_time - paused_time)/(sample);
double tile_time = (tile == 0 || sample == 0)? 0.0: (time_dt() - preview_time - paused_time) / sample;
/* negative can happen when we pause a bit before rendering, can discard that */
if(preview_time < 0.0) preview_time = 0.0;