diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-11-16 23:55:13 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-11-16 23:55:13 +0300 |
| commit | c9fb08e075733fbba11be3dd1881fb3422fc6b94 (patch) | |
| tree | c8bfd87b1a6ef7728ea3dbc10d578cc007bfe0c5 /intern/cycles/session | |
| parent | 9d7422b817d143b4c50c00c7d5b860a9e414c517 (diff) | |
| parent | f30e1fd2f0648d6c88bc61142ecc003ffa33ce11 (diff) | |
Merge branch 'blender-v3.0-release'
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 299d731d9f9..031b2a8b6d1 100644 --- a/intern/cycles/session/session.cpp +++ b/intern/cycles/session/session.cpp @@ -505,7 +505,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; } @@ -574,7 +574,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 { |