Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2021-07-20 20:02:37 +0300
committerSybren A. Stüvel <sybren@blender.org>2021-07-20 20:02:43 +0300
commitb65ec08bbbd43119a187377fd45d9eb05f8f8c15 (patch)
treee7d2fccb2c613c38df8674016d8aad660d9e9ee3
parent26b2a35dd44c2782e076514cb972529afb1cca64 (diff)
Armature test: properly initialize bone hierarchy
Fix segfault in `BKE_armature_find_selected_bones_test` by property initializing the bone hierarchy listbases. No functional changes to Blender.
-rw-r--r--source/blender/blenkernel/intern/armature_test.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/armature_test.cc b/source/blender/blenkernel/intern/armature_test.cc
index 0ad2b58f5d9..47853deec3e 100644
--- a/source/blender/blenkernel/intern/armature_test.cc
+++ b/source/blender/blenkernel/intern/armature_test.cc
@@ -171,10 +171,14 @@ class BKE_armature_find_selected_bones_test : public testing::Test {
strcpy(bone2.name, "bone2");
strcpy(bone3.name, "bone3");
- arm.bonebase = {NULL, NULL};
- BLI_addtail(&arm.bonebase, &bone1);
- BLI_addtail(&arm.bonebase, &bone2);
- BLI_addtail(&arm.bonebase, &bone3);
+ arm.bonebase = {nullptr, nullptr};
+ bone1.childbase = {nullptr, nullptr};
+ bone2.childbase = {nullptr, nullptr};
+ bone3.childbase = {nullptr, nullptr};
+
+ BLI_addtail(&arm.bonebase, &bone1); // bone1 is root bone
+ BLI_addtail(&arm.bonebase, &bone2); // bone2 is root bone
+ BLI_addtail(&bone2.childbase, &bone3); // bone3 has bone2 as parent
// Make sure the armature & its bones are visible, to make them selectable.
arm.layer = bone1.layer = bone2.layer = bone3.layer = 1;