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 | |
| parent | cf83719761208cc432da08930ed478bf35f29f6c (diff) | |
| parent | b496c1c721a38589220d5a2916b4738af91312b6 (diff) | |
Merge branch 'blender-v3.0-release'
| -rw-r--r-- | intern/cycles/blender/session.cpp | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/action_test.cc | 8 |
2 files changed, 6 insertions, 6 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; } diff --git a/source/blender/blenkernel/intern/action_test.cc b/source/blender/blenkernel/intern/action_test.cc index c0d9a4c6055..8423bc923f3 100644 --- a/source/blender/blenkernel/intern/action_test.cc +++ b/source/blender/blenkernel/intern/action_test.cc @@ -181,7 +181,7 @@ TEST(action_assets, BKE_action_has_single_frame) /* No FCurves. */ { - const bAction empty = {nullptr}; + const bAction empty = {{nullptr}}; EXPECT_FALSE(BKE_action_has_single_frame(&empty)) << "Action without FCurves cannot have a single frame."; } @@ -192,7 +192,7 @@ TEST(action_assets, BKE_action_has_single_frame) std::unique_ptr<BezTriple[]> bezt = allocate_keyframes(&fcu, 1); add_keyframe(&fcu, 1.0f, 2.0f); - bAction action = {nullptr}; + bAction action = {{nullptr}}; BLI_addtail(&action.curves, &fcu); EXPECT_TRUE(BKE_action_has_single_frame(&action)) @@ -208,7 +208,7 @@ TEST(action_assets, BKE_action_has_single_frame) add_keyframe(&fcu1, 1.0f, 327.0f); add_keyframe(&fcu2, 1.0f, 47.0f); /* Same X-coordinate as the other one. */ - bAction action = {nullptr}; + bAction action = {{nullptr}}; BLI_addtail(&action.curves, &fcu1); BLI_addtail(&action.curves, &fcu2); @@ -228,7 +228,7 @@ TEST(action_assets, BKE_action_has_single_frame) add_keyframe(&fcu, 1.0f, 2.0f); add_keyframe(&fcu, 2.0f, 2.5f); - bAction action = {nullptr}; + bAction action = {{nullptr}}; BLI_addtail(&action.curves, &fcu); EXPECT_FALSE(BKE_action_has_single_frame(&action)) |