Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_outliner/tree/tree_display_sequencer.cc')
-rw-r--r--source/blender/editors/space_outliner/tree/tree_display_sequencer.cc11
1 files changed, 5 insertions, 6 deletions
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 c2739d876f4..530ce40bae7 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
@@ -28,9 +28,9 @@ TreeDisplaySequencer::TreeDisplaySequencer(SpaceOutliner &space_outliner)
{
}
-ListBase TreeDisplaySequencer::buildTree(const TreeSourceData &source_data)
+SubTree TreeDisplaySequencer::buildTree(const TreeSourceData &source_data)
{
- ListBase tree = {nullptr};
+ SubTree tree;
Editing *ed = SEQ_editing_get(source_data.scene);
if (ed == nullptr) {
@@ -40,11 +40,10 @@ ListBase TreeDisplaySequencer::buildTree(const TreeSourceData &source_data)
for (Sequence *seq : List<Sequence>(ed->seqbasep)) {
SequenceAddOp op = need_add_seq_dup(seq);
if (op == SEQUENCE_DUPLICATE_NONE) {
- outliner_add_element(&space_outliner_, &tree, seq, nullptr, TSE_SEQUENCE, 0);
+ outliner_add_element(&space_outliner_, seq, tree, TSE_SEQUENCE, 0);
}
else if (op == SEQUENCE_DUPLICATE_ADD) {
- TreeElement *te = outliner_add_element(
- &space_outliner_, &tree, seq, nullptr, TSE_SEQUENCE_DUP, 0);
+ TreeElement *te = outliner_add_element(&space_outliner_, seq, tree, TSE_SEQUENCE_DUP, 0);
add_seq_dup(seq, te, 0);
}
}
@@ -101,7 +100,7 @@ void TreeDisplaySequencer::add_seq_dup(Sequence *seq, TreeElement *te, short ind
}
if (STREQ(p->strip->stripdata->name, seq->strip->stripdata->name)) {
- outliner_add_element(&space_outliner_, &te->subtree, (void *)p, te, TSE_SEQUENCE, index);
+ outliner_add_element(&space_outliner_, (void *)p, te, TSE_SEQUENCE, index);
}
p = p->next;
}