diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-11-17 00:40:08 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-11-17 00:40:08 +0300 |
commit | 59da22c30927f11194a73d678d0488e6bef7074c (patch) | |
tree | 7c42108f995e14a700963ec52aa37a66cec73bad /intern/cycles/blender | |
parent | cf83719761208cc432da08930ed478bf35f29f6c (diff) | |
parent | b496c1c721a38589220d5a2916b4738af91312b6 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r-- | intern/cycles/blender/session.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/session.cpp b/intern/cycles/blender/session.cpp index c786b29d442..b8ac437443b 100644 --- a/intern/cycles/blender/session.cpp +++ b/intern/cycles/blender/session.cpp @@ -865,7 +865,7 @@ void BlenderSession::update_bake_progress() double progress = session->progress.get_progress(); if (progress != last_progress) { - b_engine.update_progress(progress); + b_engine.update_progress((float)progress); last_progress = progress; } } @@ -918,7 +918,7 @@ void BlenderSession::update_status_progress() last_status_time = current_time; } if (progress != last_progress) { - b_engine.update_progress(progress); + b_engine.update_progress((float)progress); last_progress = progress; } |