blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T94563: Cycles standalone build error on with strict float/double casting 

Thanks to John David for finding this.
This commit is contained in:
Brecht Van Lommel 2022-01-05 20:03:16 +01:00 committed by Philipp Oeser
parent c3457af23f
commit 7d26cf01f7
Notes: blender-bot 2023-02-13 16:59:23 +01:00 
Referenced by issue #94563, blender-3.0.0 compilation error on progress.get_progress() return values
Referenced by issue #93479, 3.0 Potential candidates for corrective releases
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/app/cycles_standalone.cpp
View File

@ -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;