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:
authorBrecht Van Lommel <brecht@blender.org>2021-11-17 01:21:13 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-11-17 01:21:13 +0300
commit93f26d652e2727edbb1ebb5ffefc00e039a17599 (patch)
treef3eccf7caa3ae8cc52f35b1420ac0697792f1291 /intern/cycles/session/session.cpp
parentfbf4fe6963a44aa5d8e66035e5c1e641285a9423 (diff)
parent1e4d1eb3982831527204272ff8f45cae4e069381 (diff)
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/session/session.cpp')
-rw-r--r--intern/cycles/session/session.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/session/session.cpp b/intern/cycles/session/session.cpp
index 031b2a8b6d1..aa58a039ed1 100644
--- a/intern/cycles/session/session.cpp
+++ b/intern/cycles/session/session.cpp
@@ -506,7 +506,7 @@ void Session::set_display_driver(unique_ptr<DisplayDriver> driver)
double Session::get_estimated_remaining_time() const
{
const double completed = progress.get_progress();
- if (completed == 0.0f) {
+ if (completed == 0.0) {
return 0.0;
}