diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-11-16 22:44:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-16 22:49:32 +0300 |
| commit | cfd0e96e47ed34888077b989854ba5a557bac43b (patch) | |
| tree | 0afe6d7a14af81482266ba581336143c61f57fc6 /intern/cycles/session | |
| parent | 7293c1b3578e015a00e8b1e282baa62f51c5b4c4 (diff) | |
Fix T93125: Cycles wrong remaining render time with high number of samples
Avoid integer overflow.
Diffstat (limited to 'intern/cycles/session')
| -rw-r--r-- | intern/cycles/session/session.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/session/session.cpp b/intern/cycles/session/session.cpp index b228939689c..170af5c70b6 100644 --- a/intern/cycles/session/session.cpp +++ b/intern/cycles/session/session.cpp @@ -504,7 +504,7 @@ void Session::set_display_driver(unique_ptr<DisplayDriver> driver) double Session::get_estimated_remaining_time() const { - const float completed = progress.get_progress(); + const double completed = progress.get_progress(); if (completed == 0.0f) { return 0.0; } @@ -573,7 +573,7 @@ void Session::update_status_time(bool show_pause, bool show_done) } /* Sample. */ - if (num_samples == Integrator::MAX_SAMPLES) { + if (!params.background && num_samples == Integrator::MAX_SAMPLES) { substatus = status_append(substatus, string_printf("Sample %d", current_sample)); } else { |