From b65ec08bbbd43119a187377fd45d9eb05f8f8c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 20 Jul 2021 19:02:37 +0200 Subject: 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. --- source/blender/blenkernel/intern/armature_test.cc | 12 ++++++++---- 1 file 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; -- cgit v1.2.3