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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-01-05 22:03:16 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-01-05 22:05:16 +0300
commitf7a0f6a0e4bf4d9233d9fdabf603793288e15d0d (patch)
tree36353c071c8c0753773020f17d560a1c82253aa8 /intern
parent1dc0bf86bb50ac8fb20df071472cee53dbe31fcb (diff)
Fix T94563: Cycles standalone build error on with strict float/double casting
Thanks to John David for finding this.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/app/cycles_standalone.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 0032938b116..7123edbef64 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -82,7 +82,7 @@ static void session_print_status()
string status, substatus;
/* get status */
- float progress = options.session->progress.get_progress();
+ double progress = options.session->progress.get_progress();
options.session->progress.get_status(status, substatus);
if (substatus != "")
@@ -183,7 +183,7 @@ static void display_info(Progress &progress)
progress.get_time(total_time, sample_time);
progress.get_status(status, substatus);
- float progress_val = progress.get_progress();
+ double progress_val = progress.get_progress();
if (substatus != "")
status += ": " + substatus;