diff options
Diffstat (limited to 'source/blender/editors/space_outliner/tree')
8 files changed, 16 insertions, 6 deletions
diff --git a/source/blender/editors/space_outliner/tree/tree_display.h b/source/blender/editors/space_outliner/tree/tree_display.h index c0a751f2cd5..b6dc33ba7b7 100644 --- a/source/blender/editors/space_outliner/tree/tree_display.h +++ b/source/blender/editors/space_outliner/tree/tree_display.h @@ -49,12 +49,20 @@ ListBase outliner_tree_display_build_tree(TreeDisplay *tree_display, TreeSourceD /* The following functions are needed to build the tree. They are calls back into C; the way * elements are created should be refactored and ported to C++ with a new design/API too. */ +/** + * TODO: this function needs to be split up! It's getting a bit too large... + * + * \note "ID" is not always a real ID. + * \note If child items are only added to the tree if the item is open, + * the `TSE_` type _must_ be added to #outliner_element_needs_rebuild_on_open_change(). + */ struct TreeElement *outliner_add_element(SpaceOutliner *space_outliner, ListBase *lb, void *idv, struct TreeElement *parent, short type, short index); +/* make sure elements are correctly nested */ void outliner_make_object_parent_hierarchy(ListBase *lb); bool outliner_animdata_test(const struct AnimData *adt); TreeElement *outliner_add_collection_recursive(SpaceOutliner *space_outliner, diff --git a/source/blender/editors/space_outliner/tree/tree_display.hh b/source/blender/editors/space_outliner/tree/tree_display.hh index 8aaf396888f..54e64655b18 100644 --- a/source/blender/editors/space_outliner/tree/tree_display.hh +++ b/source/blender/editors/space_outliner/tree/tree_display.hh @@ -148,6 +148,9 @@ class TreeDisplaySequencer final : public AbstractTreeDisplay { private: TreeElement *add_sequencer_contents() const; + /** + * Helped function to put duplicate sequence in the same tree. + */ SequenceAddOp need_add_seq_dup(Sequence *seq) const; void add_seq_dup(Sequence *seq, TreeElement *te, short index) const; }; diff --git a/source/blender/editors/space_outliner/tree/tree_display_libraries.cc b/source/blender/editors/space_outliner/tree/tree_display_libraries.cc index 371813cfb3f..836f0937cf4 100644 --- a/source/blender/editors/space_outliner/tree/tree_display_libraries.cc +++ b/source/blender/editors/space_outliner/tree/tree_display_libraries.cc @@ -33,7 +33,6 @@ namespace blender::ed::outliner { -/* Convenience/readability. */ template<typename T> using List = ListBaseWrapper<T>; TreeDisplayLibraries::TreeDisplayLibraries(SpaceOutliner &space_outliner) diff --git a/source/blender/editors/space_outliner/tree/tree_display_orphaned.cc b/source/blender/editors/space_outliner/tree/tree_display_orphaned.cc index 69ccf014642..eeb3ca6893a 100644 --- a/source/blender/editors/space_outliner/tree/tree_display_orphaned.cc +++ b/source/blender/editors/space_outliner/tree/tree_display_orphaned.cc @@ -31,7 +31,6 @@ namespace blender::ed::outliner { -/* Convenience/readability. */ template<typename T> using List = ListBaseWrapper<T>; TreeDisplayIDOrphans::TreeDisplayIDOrphans(SpaceOutliner &space_outliner) diff --git a/source/blender/editors/space_outliner/tree/tree_display_override_library.cc b/source/blender/editors/space_outliner/tree/tree_display_override_library.cc index 0e4636db69d..943e182277c 100644 --- a/source/blender/editors/space_outliner/tree/tree_display_override_library.cc +++ b/source/blender/editors/space_outliner/tree/tree_display_override_library.cc @@ -34,6 +34,11 @@ namespace blender::ed::outliner { /* Convenience/readability. */ +/* Convenience/readability. */ +/* Convenience/readability. */ +/* Convenience/readability. */ +/* Convenience/readability. */ +/* Convenience/readability. */ template<typename T> using List = ListBaseWrapper<T>; TreeDisplayOverrideLibrary::TreeDisplayOverrideLibrary(SpaceOutliner &space_outliner) diff --git a/source/blender/editors/space_outliner/tree/tree_display_scenes.cc b/source/blender/editors/space_outliner/tree/tree_display_scenes.cc index 390f81cfcd1..29442aace37 100644 --- a/source/blender/editors/space_outliner/tree/tree_display_scenes.cc +++ b/source/blender/editors/space_outliner/tree/tree_display_scenes.cc @@ -29,7 +29,6 @@ namespace blender::ed::outliner { -/* Convenience/readability. */ template<typename T> using List = ListBaseWrapper<T>; TreeDisplayScenes::TreeDisplayScenes(SpaceOutliner &space_outliner) diff --git a/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc b/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc index 02af6a13cb3..aa28b164584 100644 --- a/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc +++ b/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc @@ -31,7 +31,6 @@ namespace blender::ed::outliner { -/* Convenience/readability. */ template<typename T> using List = ListBaseWrapper<T>; TreeDisplaySequencer::TreeDisplaySequencer(SpaceOutliner &space_outliner) @@ -63,7 +62,6 @@ ListBase TreeDisplaySequencer::buildTree(const TreeSourceData &source_data) return tree; } -/* Helped function to put duplicate sequence in the same tree. */ SequenceAddOp TreeDisplaySequencer::need_add_seq_dup(Sequence *seq) const { if ((!seq->strip) || (!seq->strip->stripdata)) { diff --git a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc index c3d0aecd3cb..ebbc9baaa9f 100644 --- a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc +++ b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc @@ -37,7 +37,6 @@ namespace blender::ed::outliner { -/* Convenience/readability. */ template<typename T> using List = ListBaseWrapper<T>; class ObjectsChildrenBuilder { |