blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 763 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Brecht Van Lommel 2021-11-16 22:40:08 +01:00
parent cf83719761 b496c1c721
commit 59da22c309
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/session.cpp
View File

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

8
source/blender/blenkernel/intern/action_test.cc
View File

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