griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Anim: Outliner, show bone collections in their hierarchy

Browse Source 
The Outliner now shows an Armature's bone collections as a hierarchy
instead of a flat list.
This commit is contained in:
Sybren A. Stüvel
2024-01-08 12:30:58 +01:00
parent fed446ce8a
commit 2e2b5dcd52
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_outliner/tree/tree_element.cc
View File

@@ -198,7 +198,9 @@ std::unique_ptr<AbstractTreeElement> AbstractTreeElement::create_from_type(const
legacy_te, *reinterpret_cast<bArmature *>(owner_id));
case TSE_BONE_COLLECTION:
return std::make_unique<TreeElementBoneCollection>(
legacy_te, *static_cast<BoneCollection *>(create_data));
legacy_te,
*reinterpret_cast<bArmature *>(owner_id),
*static_cast<BoneCollection *>(create_data));
default:
break;

21
source/blender/editors/space_outliner/tree/tree_element_bone_collection.cc
View File

@@ -30,19 +30,32 @@ TreeElementBoneCollectionBase::TreeElementBoneCollectionBase(TreeElement &legacy
void TreeElementBoneCollectionBase::expand(SpaceOutliner & /*space_outliner*/) const
{
for (int index = 0; index < armature_.collection_array_num; index++) {
BoneCollection *bcoll = armature_.collection_array[index];
int index = 0;
for (BoneCollection *bcoll : armature_.collections_roots()) {
add_element(
&legacy_te_.subtree, &armature_.id, bcoll, &legacy_te_, TSE_BONE_COLLECTION, index);
index++;
}
}
TreeElementBoneCollection::TreeElementBoneCollection(TreeElement &legacy_te, BoneCollection &bcoll)
: AbstractTreeElement(legacy_te), bcoll_(bcoll)
TreeElementBoneCollection::TreeElementBoneCollection(TreeElement &legacy_te,
bArmature &armature,
BoneCollection &bcoll)
: AbstractTreeElement(legacy_te), armature_(armature), bcoll_(bcoll)
{
BLI_assert(legacy_te.store_elem->type == TSE_BONE_COLLECTION);
legacy_te.name = bcoll_.name;
legacy_te.directdata = &bcoll_;
}
void TreeElementBoneCollection::expand(SpaceOutliner & /*space_outliner*/) const
{
int index = 0;
for (BoneCollection *child_bcoll : armature_.collection_children(&bcoll_)) {
add_element(
&legacy_te_.subtree, &armature_.id, child_bcoll, &legacy_te_, TSE_BONE_COLLECTION, index);
index++;
}
}
} // namespace blender::ed::outliner

4
source/blender/editors/space_outliner/tree/tree_element_bone_collection.hh
View File

@@ -24,10 +24,12 @@ class TreeElementBoneCollectionBase final : public AbstractTreeElement {
};
class TreeElementBoneCollection final : public AbstractTreeElement {
bArmature &armature_;
BoneCollection &bcoll_;
public:
TreeElementBoneCollection(TreeElement &legacy_te, BoneCollection &bcoll);
TreeElementBoneCollection(TreeElement &legacy_te, bArmature &armature, BoneCollection &bcoll);
void expand(SpaceOutliner &) const override;
};
} // namespace blender::ed::outliner