From cfd0e96e47ed34888077b989854ba5a557bac43b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 16 Nov 2021 20:44:31 +0100 Subject: Fix T93125: Cycles wrong remaining render time with high number of samples Avoid integer overflow. --- intern/cycles/session/session.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/session') 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 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 { -- cgit v1.2.3