blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 783 Projects 19 Wiki Activity

Outliner: Port mesh elements to new tree-element code design #108437

Merged
Julian Eisel merged 3 commits from :temp-id-mesh-refactor into main 2023-05-31 18:43:54 +02:00
Conversation 1 Commits 3 Files Changed 5 +12 -11
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83b1d399c4 - Show all commits

15
source/blender/editors/space_outliner/tree/tree_element_id_mesh.cc
View File

@ -15,7 +15,7 @@
namespace blender::ed::outliner {
TreeElementIDMesh::TreeElementIDMesh(TreeElement &legacy_te_, Mesh &mesh)
: TreeElementID(legacy_te_, mesh.id), mesh_(mesh)
: TreeElementID(legacy_te_, mesh.id), mesh_(mesh)
{
}
@ -27,22 +27,23 @@ bool TreeElementIDMesh::isExpandValid() const
void TreeElementIDMesh::expand(SpaceOutliner &space_outliner) const
{
expand_animation_data(space_outliner, mesh_.adt);
expandKey(space_outliner);
expandMaterials(space_outliner);
}
void TreeElementIDMesh::expandKey(SpaceOutliner &space_outliner) const
{
outliner_add_element(&space_outliner, &legacy_te_.subtree, mesh_.key, &legacy_te_, TSE_SOME_ID, 0);
outliner_add_element(
&space_outliner, &legacy_te_.subtree, mesh_.key, &legacy_te_, TSE_SOME_ID, 0);
}
void TreeElementIDMesh::expandMaterials(SpaceOutliner &space_outliner) const
{
for (int a = 0; a < mesh_.totcol; a++)
{
outliner_add_element(&space_outliner, &legacy_te_.subtree, mesh_.mat[a], &legacy_te_, TSE_SOME_ID, a);
for (int a = 0; a < mesh_.totcol; a++) {
outliner_add_element(
&space_outliner, &legacy_te_.subtree, mesh_.mat[a], &legacy_te_, TSE_SOME_ID, a);
}
}
} // namespace blender::ed::outliner
} // namespace blender::ed::outliner

8
source/blender/editors/space_outliner/tree/tree_element_id_mesh.hh
View File

@ -12,16 +12,16 @@ namespace blender::ed::outliner {
class TreeElementIDMesh final : public TreeElementID {
Mesh &mesh_;
public:
TreeElementIDMesh(TreeElement &legacy_te_, Mesh &mesh);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandKey(SpaceOutliner &) const;
void expandMaterials(SpaceOutliner &) const;
};
} // namespace blender::ed::outliner
} // namespace blender::ed::outliner