[Bf-blender-cvs] [7cddc047ba4] temp-outliner-library-override-hierarchy: Rename Hierarchy view mode to Hierarchies
Julian Eisel
noreply at git.blender.org
Thu Apr 14 11:44:20 CEST 2022
Commit: 7cddc047ba44689be4c73e1bf8226c358b5b7c40
Author: Julian Eisel
Date: Thu Mar 31 12:08:24 2022 +0200
Branches: temp-outliner-library-override-hierarchy
https://developer.blender.org/rB7cddc047ba44689be4c73e1bf8226c358b5b7c40
Rename Hierarchy view mode to Hierarchies
===================================================================
M release/scripts/startup/bl_ui/space_outliner.py
M source/blender/editors/space_outliner/CMakeLists.txt
M source/blender/editors/space_outliner/tree/tree_display.cc
M source/blender/editors/space_outliner/tree/tree_display.hh
R095 source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchy.cc source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 55926980b3b..eff8ad8e8b3 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -43,9 +43,9 @@ class OUTLINER_HT_header(Header):
text="",
icon='FILTER',
)
- if display_mode == 'LIBRARY_OVERRIDES' and space.lib_override_view_mode == 'HIERARCHY':
- # Don't add ID type filter for library overrides hierarchy mode. Point of it is to see a hierarchy that is usually
- # constructed out of different ID types.
+ if display_mode == 'LIBRARY_OVERRIDES' and space.lib_override_view_mode == 'HIERARCHIES':
+ # Don't add ID type filter for library overrides hierarchies mode. Point of it is to see a hierarchy that is
+ # usually constructed out of different ID types.
pass
elif display_mode in {'LIBRARIES', 'LIBRARY_OVERRIDES', 'ORPHAN_DATA'}:
row.prop(space, "use_filter_id_type", text="", icon='FILTER')
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index a8c016cdbad..fae0e4be2a8 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -39,7 +39,7 @@ set(SRC
tree/tree_display_libraries.cc
tree/tree_display_orphaned.cc
tree/tree_display_override_library_properties.cc
- tree/tree_display_override_library_hierarchy.cc
+ tree/tree_display_override_library_hierarchies.cc
tree/tree_display_scenes.cc
tree/tree_display_sequencer.cc
tree/tree_display_view_layer.cc
diff --git a/source/blender/editors/space_outliner/tree/tree_display.cc b/source/blender/editors/space_outliner/tree/tree_display.cc
index d1fb1a20b0a..141c68594e8 100644
--- a/source/blender/editors/space_outliner/tree/tree_display.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display.cc
@@ -33,8 +33,8 @@ std::unique_ptr<AbstractTreeDisplay> AbstractTreeDisplay::createFromDisplayMode(
switch ((eSpaceOutliner_LibOverrideViewMode)space_outliner.lib_override_view_mode) {
case SO_LIB_OVERRIDE_VIEW_PROPERTIES:
return std::make_unique<TreeDisplayOverrideLibraryProperties>(space_outliner);
- case SO_LIB_OVERRIDE_VIEW_HIERARCHY:
- return std::make_unique<TreeDisplayOverrideLibraryHierarchy>(space_outliner);
+ case SO_LIB_OVERRIDE_VIEW_HIERARCHIES:
+ return std::make_unique<TreeDisplayOverrideLibraryHierarchies>(space_outliner);
}
break;
case SO_VIEW_LAYER:
diff --git a/source/blender/editors/space_outliner/tree/tree_display.hh b/source/blender/editors/space_outliner/tree/tree_display.hh
index 2bb05bb4b1f..327f29aa15e 100644
--- a/source/blender/editors/space_outliner/tree/tree_display.hh
+++ b/source/blender/editors/space_outliner/tree/tree_display.hh
@@ -143,16 +143,18 @@ class TreeDisplayOverrideLibraryProperties final : public AbstractTreeDisplay {
};
/**
- * \brief Tree-Display for the Library Overrides display mode, Hierarchy view mode.
+ * \brief Tree-Display for the Library Overrides display mode, Hierarchies view mode.
*/
-class TreeDisplayOverrideLibraryHierarchy final : public AbstractTreeDisplay {
+class TreeDisplayOverrideLibraryHierarchies final : public AbstractTreeDisplay {
public:
- TreeDisplayOverrideLibraryHierarchy(SpaceOutliner &space_outliner);
+ TreeDisplayOverrideLibraryHierarchies(SpaceOutliner &space_outliner);
ListBase buildTree(const TreeSourceData &source_data) override;
private:
- ListBase build_hierarchy_for_lib_or_main(Main *bmain, TreeElement &parent_te, Library *lib = nullptr);
+ ListBase build_hierarchy_for_lib_or_main(Main *bmain,
+ TreeElement &parent_te,
+ Library *lib = nullptr);
void build_hierarchy_for_ID(Main *bmain, ID &override_root_id, TreeElementID &te_id) const;
};
diff --git a/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchy.cc b/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc
similarity index 95%
rename from source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchy.cc
rename to source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc
index 1c0e2953278..4b568a6004d 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchy.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc
@@ -28,7 +28,7 @@ namespace blender::ed::outliner {
class AbstractTreeElement;
-TreeDisplayOverrideLibraryHierarchy::TreeDisplayOverrideLibraryHierarchy(
+TreeDisplayOverrideLibraryHierarchies::TreeDisplayOverrideLibraryHierarchies(
SpaceOutliner &space_outliner)
: AbstractTreeDisplay(space_outliner)
{
@@ -41,7 +41,7 @@ static void remove_expanded_children(TreeElement &te)
outliner_free_tree(&te.subtree);
}
-ListBase TreeDisplayOverrideLibraryHierarchy::buildTree(const TreeSourceData &source_data)
+ListBase TreeDisplayOverrideLibraryHierarchies::buildTree(const TreeSourceData &source_data)
{
ListBase tree = {nullptr};
@@ -83,7 +83,7 @@ ListBase TreeDisplayOverrideLibraryHierarchy::buildTree(const TreeSourceData &so
return tree;
}
-ListBase TreeDisplayOverrideLibraryHierarchy::build_hierarchy_for_lib_or_main(
+ListBase TreeDisplayOverrideLibraryHierarchies::build_hierarchy_for_lib_or_main(
Main *bmain, TreeElement &parent_te, Library *lib)
{
ListBase tree = {nullptr};
@@ -210,7 +210,7 @@ static int build_hierarchy_foreach_ID_cb(LibraryIDLinkCallbackData *cb_data)
return IDWALK_RET_NOP;
}
-void TreeDisplayOverrideLibraryHierarchy::build_hierarchy_for_ID(Main *bmain,
+void TreeDisplayOverrideLibraryHierarchies::build_hierarchy_for_ID(Main *bmain,
ID &override_root_id,
TreeElementID &te_id) const
{
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index e6f23d18319..e9bf3126c97 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -396,8 +396,8 @@ typedef enum eSpaceOutliner_Mode {
typedef enum eSpaceOutliner_LibOverrideViewMode {
/* View all overrides with RNA buttons to edit the overridden values. */
SO_LIB_OVERRIDE_VIEW_PROPERTIES = 0,
- /* View entire override hierarchies. */
- SO_LIB_OVERRIDE_VIEW_HIERARCHY = 1,
+ /* View entire override hierarchies (relationships between overriden data-blocks). */
+ SO_LIB_OVERRIDE_VIEW_HIERARCHIES = 1,
} eSpaceOutliner_LibOverrideViewMode;
/** #SpaceOutliner.storeflag */
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index cb3fdbd1fe6..e21c10166ab 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -3600,10 +3600,10 @@ static void rna_def_space_outliner(BlenderRNA *brna)
"Properties",
"Display all local override data-blocks with their overridden properties and buttons to "
"edit them"},
- {SO_LIB_OVERRIDE_VIEW_HIERARCHY,
- "HIERARCHY",
+ {SO_LIB_OVERRIDE_VIEW_HIERARCHIES,
+ "HIERARCHIES",
ICON_NONE,
- "Hierarchy",
+ "Hierarchies",
"Display library override relationships"},
{0, NULL, 0, NULL, NULL},
};
More information about the Bf-blender-cvs
mailing list