diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-06 17:30:52 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-06 17:30:52 +0300 |
| commit | a51e9ece538fb00c939ccaca7d6fbb1fe491bf10 (patch) | |
| tree | 3124592d7553123fe524357cef84192a6aae3c9c /intern/cycles/blender/blender_session.cpp | |
| parent | d6ae94b9885d260f058da057b5a47762680d32c9 (diff) | |
Cycles: Fix misleading remaining time report when using infinite number of samples in viewport
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 92b5b7277f4..3e7fba01137 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -936,7 +936,7 @@ void BlenderSession::get_progress(float& progress, double& total_time, double& r if(background && samples_per_tile && tile_total) progress = ((float)sample / (float)(tile_total * samples_per_tile)); - else if(!background && samples > 0 && total_samples != USHRT_MAX) + else if(!background && samples > 0 && total_samples != INT_MAX) progress = ((float)samples) / total_samples; else progress = 0.0; |