[Bf-blender-cvs] [f7a0f6a0e4b] master: Fix T94563: Cycles standalone build error on with strict float/double casting
Brecht Van Lommel
noreply at git.blender.org
Wed Jan 5 20:05:25 CET 2022
Commit: f7a0f6a0e4bf4d9233d9fdabf603793288e15d0d
Author: Brecht Van Lommel
Date: Wed Jan 5 20:03:16 2022 +0100
Branches: master
https://developer.blender.org/rBf7a0f6a0e4bf4d9233d9fdabf603793288e15d0d
Fix T94563: Cycles standalone build error on with strict float/double casting
Thanks to John David for finding this.
===================================================================
M intern/cycles/app/cycles_standalone.cpp
===================================================================
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;
More information about the Bf-blender-cvs
mailing list