diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-09-24 17:16:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-09-24 17:34:15 +0300 |
| commit | c0db8e3b41e21bb6f8327a038601827a0d20a9cc (patch) | |
| tree | cb38e0f0af122df622ae5ebbc9f8c60f813df66a /intern/cycles/blender | |
| parent | 585998987ab1a948d3aee7e377764fe2900b4e03 (diff) | |
Fix T91660: Cycles remaining render time does not take into account time limit
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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) |