From c0db8e3b41e21bb6f8327a038601827a0d20a9cc Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 24 Sep 2021 16:16:16 +0200 Subject: Fix T91660: Cycles remaining render time does not take into account time limit --- intern/cycles/blender/blender_session.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'intern/cycles/blender') diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 33092129ddf..ef1bc038a87 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -993,8 +993,9 @@ void BlenderSession::update_status_progress() get_status(status, substatus); get_progress(progress, total_time, render_time); - if (progress > 0) - remaining_time = (1.0 - (double)progress) * (render_time / (double)progress); + if (progress > 0) { + remaining_time = session->get_estimated_remaining_time(); + } if (background) { if (scene) -- cgit v1.2.3