Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/session/session.cpp')
-rw-r--r--intern/cycles/session/session.cpp4
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 {