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

Outliner: Remove isExpandValid() from AbstractTreeElement and its sub-classes

Browse Source 
No user visible changes expected.

Part of #96713, continuation of work started in 249e4df110 and 2e221de4ce.
Refer to these for a motivation and design overview.

Removes `isExpandValid()` from `AbstractTreeElement` and its sub-classes as all ID elements are ported to new tree-element code design. It was meant to be temporary for this transition phase.

Pull Request: https://projects.blender.org/blender/blender/pulls/109380
This commit is contained in:
Almaz Shinbay
2023-06-26 16:59:44 +02:00
committed by Julian Eisel
parent adb370e6ba
commit 4094cd207a
27 changed files with 1 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_outliner/outliner_tree.cc
View File

@@ -324,7 +324,7 @@ TreeElement *outliner_add_element(SpaceOutliner *space_outliner,
if (!expand) {
/* Pass */
}
else if (te->abstract_element && te->abstract_element->isExpandValid()) {
else if (te->abstract_element) {
tree_element_expand(*te->abstract_element, *space_outliner);
}
else if (ELEM(type,

9
source/blender/editors/space_outliner/tree/tree_element.hh
View File

@@ -48,15 +48,6 @@ class AbstractTreeElement {
return true;
}
/**
* Just while transitioning to the new tree-element design: Some types are only partially ported,
* and the expanding isn't done yet.
*/
virtual bool isExpandValid() const
{
return true;
}
TreeElement &getLegacyElement()
{
return legacy_te_;

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

@@ -28,14 +28,6 @@ class TreeElementID : public AbstractTreeElement {
bool expandPoll(const SpaceOutliner &) const override;
/**
* Expanding not implemented for all types yet. Once it is, this can be set to true or
* `AbstractTreeElement::expandValid()` can be removed altogether.
*/
bool isExpandValid() const override
{
return true;
}
void expand(SpaceOutliner &) const override;
ID &get_ID()

5
source/blender/editors/space_outliner/tree/tree_element_id_armature.cc
View File

@@ -48,11 +48,6 @@ void TreeElementIDArmature::expand(SpaceOutliner &space_outliner) const
}
}
bool TreeElementIDArmature::isExpandValid() const
{
return true;
}
void TreeElementIDArmature::expandEditBones(SpaceOutliner &space_outiner) const
{
int a = 0;

1
source/blender/editors/space_outliner/tree/tree_element_id_armature.hh
View File

@@ -23,7 +23,6 @@ class TreeElementIDArmature final : public TreeElementID {
TreeElementIDArmature(TreeElement &legacy_te, bArmature &arm);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandEditBones(SpaceOutliner &) const;

5
source/blender/editors/space_outliner/tree/tree_element_id_collection.cc
View File

@@ -21,11 +21,6 @@ TreeElementIDCollection::TreeElementIDCollection(TreeElement &legacy_te, Collect
{
}
bool TreeElementIDCollection::isExpandValid() const
{
return true;
}
void TreeElementIDCollection::expand(SpaceOutliner &space_outliner) const
{
/* Don't expand for instances, creates too many elements. */

1
source/blender/editors/space_outliner/tree/tree_element_id_collection.hh
View File

@@ -19,7 +19,6 @@ class TreeElementIDCollection final : public TreeElementID {
TreeElementIDCollection(TreeElement &legacy_te, Collection &collection);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
};
} // namespace blender::ed::outliner

5
source/blender/editors/space_outliner/tree/tree_element_id_curve.cc
View File

@@ -21,11 +21,6 @@ TreeElementIDCurve::TreeElementIDCurve(TreeElement &legacy_te, Curve &curve)
{
}
bool TreeElementIDCurve::isExpandValid() const
{
return true;
}
void TreeElementIDCurve::expand(SpaceOutliner &space_outliner) const
{
expand_animation_data(space_outliner, curve_.adt);

1
source/blender/editors/space_outliner/tree/tree_element_id_curve.hh
View File

@@ -19,7 +19,6 @@ class TreeElementIDCurve final : public TreeElementID {
TreeElementIDCurve(TreeElement &legacy_te, Curve &curve);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandMaterials(SpaceOutliner &) const;

5
source/blender/editors/space_outliner/tree/tree_element_id_gpencil_legacy.cc
View File

@@ -31,11 +31,6 @@ void TreeElementIDGPLegacy::expand(SpaceOutliner &space_outliner) const
expandLayers(space_outliner);
}
bool TreeElementIDGPLegacy::isExpandValid() const
{
return true;
}
void TreeElementIDGPLegacy::expandLayers(SpaceOutliner &space_outliner) const
{
int index = 0;

1
source/blender/editors/space_outliner/tree/tree_element_id_gpencil_legacy.hh
View File

@@ -19,7 +19,6 @@ class TreeElementIDGPLegacy final : public TreeElementID {
TreeElementIDGPLegacy(TreeElement &legacy_te, bGPdata &gpd);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandLayers(SpaceOutliner &) const;

5
source/blender/editors/space_outliner/tree/tree_element_id_library.cc
View File

@@ -23,11 +23,6 @@ TreeElementIDLibrary::TreeElementIDLibrary(TreeElement &legacy_te, Library &libr
legacy_te.name = library.filepath;
}
bool TreeElementIDLibrary::isExpandValid() const
{
return true;
}
StringRefNull TreeElementIDLibrary::getWarning() const
{
Library &library = reinterpret_cast<Library &>(id_);

2
source/blender/editors/space_outliner/tree/tree_element_id_library.hh
View File

@@ -18,8 +18,6 @@ class TreeElementIDLibrary final : public TreeElementID {
public:
TreeElementIDLibrary(TreeElement &legacy_te, Library &library);
bool isExpandValid() const override;
blender::StringRefNull getWarning() const override;
};

5
source/blender/editors/space_outliner/tree/tree_element_id_linestyle.cc
View File

@@ -31,11 +31,6 @@ void TreeElementIDLineStyle::expand(SpaceOutliner &space_outliner) const
expandTextures(space_outliner);
}
bool TreeElementIDLineStyle::isExpandValid() const
{
return true;
}
void TreeElementIDLineStyle::expandTextures(SpaceOutliner &space_outliner) const
{
for (int a = 0; a < MAX_MTEX; a++) {

1
source/blender/editors/space_outliner/tree/tree_element_id_linestyle.hh
View File

@@ -21,7 +21,6 @@ class TreeElementIDLineStyle final : public TreeElementID {
TreeElementIDLineStyle(TreeElement &legacy_te, FreestyleLineStyle &linestyle);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandTextures(SpaceOutliner &) const;

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

@@ -21,11 +21,6 @@ TreeElementIDMesh::TreeElementIDMesh(TreeElement &legacy_te_, Mesh &mesh)
{
}
bool TreeElementIDMesh::isExpandValid() const
{
return true;
}
void TreeElementIDMesh::expand(SpaceOutliner &space_outliner) const
{
expand_animation_data(space_outliner, mesh_.adt);

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

@@ -19,7 +19,6 @@ class TreeElementIDMesh final : public TreeElementID {
TreeElementIDMesh(TreeElement &legacy_te_, Mesh &mesh);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandKey(SpaceOutliner &) const;

5
source/blender/editors/space_outliner/tree/tree_element_id_metaball.cc
View File

@@ -21,11 +21,6 @@ TreeElementIDMetaBall::TreeElementIDMetaBall(TreeElement &legacy_te, MetaBall &m
{
}
bool TreeElementIDMetaBall::isExpandValid() const
{
return true;
}
void TreeElementIDMetaBall::expand(SpaceOutliner &space_outliner) const
{
expand_animation_data(space_outliner, metaball_.adt);

1
source/blender/editors/space_outliner/tree/tree_element_id_metaball.hh
View File

@@ -21,7 +21,6 @@ class TreeElementIDMetaBall final : public TreeElementID {
TreeElementIDMetaBall(TreeElement &legacy_te, MetaBall &metaball);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandMaterials(SpaceOutliner &) const;

5
source/blender/editors/space_outliner/tree/tree_element_id_object.cc
View File

@@ -51,11 +51,6 @@ void TreeElementIDObject::expand(SpaceOutliner &space_outliner) const
expandDuplicatedGroup(space_outliner);
}
bool TreeElementIDObject::isExpandValid() const
{
return true;
}
void TreeElementIDObject::expandData(SpaceOutliner &space_outliner) const
{
outliner_add_element(

1
source/blender/editors/space_outliner/tree/tree_element_id_object.hh
View File

@@ -19,7 +19,6 @@ class TreeElementIDObject final : public TreeElementID {
TreeElementIDObject(TreeElement &legacy_te, Object &object);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandData(SpaceOutliner &) const;

5
source/blender/editors/space_outliner/tree/tree_element_id_scene.cc
View File

@@ -21,11 +21,6 @@ TreeElementIDScene::TreeElementIDScene(TreeElement &legacy_te, Scene &scene)
{
}
bool TreeElementIDScene::isExpandValid() const
{
return true;
}
void TreeElementIDScene::expand(SpaceOutliner &space_outliner) const
{
expandViewLayers(space_outliner);

1
source/blender/editors/space_outliner/tree/tree_element_id_scene.hh
View File

@@ -19,7 +19,6 @@ class TreeElementIDScene final : public TreeElementID {
TreeElementIDScene(TreeElement &legacy_te, Scene &scene);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandViewLayers(SpaceOutliner &) const;

5
source/blender/editors/space_outliner/tree/tree_element_id_texture.cc
View File

@@ -21,11 +21,6 @@ TreeElementIDTexture::TreeElementIDTexture(TreeElement &legacy_te, Tex &texture)
{
}
bool TreeElementIDTexture::isExpandValid() const
{
return true;
}
void TreeElementIDTexture::expand(SpaceOutliner &space_outliner) const
{
expand_animation_data(space_outliner, texture_.adt);

1
source/blender/editors/space_outliner/tree/tree_element_id_texture.hh
View File

@@ -19,7 +19,6 @@ class TreeElementIDTexture final : public TreeElementID {
TreeElementIDTexture(TreeElement &legacy_te, Tex &texture);
void expand(SpaceOutliner &) const override;
bool isExpandValid() const override;
private:
void expandImage(SpaceOutliner &) const;

5
source/blender/editors/space_outliner/tree/tree_element_rna.cc
View File

@@ -44,11 +44,6 @@ TreeElementRNACommon::TreeElementRNACommon(TreeElement &legacy_te, PointerRNA &r
}
}
bool TreeElementRNACommon::isExpandValid() const
{
return true;
}
bool TreeElementRNACommon::isRNAValid() const
{
return rna_ptr_.data != nullptr;

1
source/blender/editors/space_outliner/tree/tree_element_rna.hh
View File

@@ -28,7 +28,6 @@ class TreeElementRNACommon : public AbstractTreeElement {
public:
TreeElementRNACommon(TreeElement &legacy_te, PointerRNA &rna_ptr);
bool isExpandValid() const override;
bool expandPoll(const SpaceOutliner &) const override;
const PointerRNA &getPointerRNA() const;