Fix T94563: Cycles standalone build error on with strict float/double casting
Thanks to John David for finding this.
This commit is contained in:
parent
1dc0bf86bb
commit
f7a0f6a0e4
Notes:
blender-bot
2023-02-14 06:23:08 +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
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue