diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-29 09:45:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-29 09:45:06 +0400 |
commit | b0de69b48f8836939b807f3671bbeb8cc3bf6899 (patch) | |
tree | f0d01795f62a26431ae4b77421af9a39871dd8df /source/blender/editors/space_outliner/outliner_tree.c | |
parent | a7c68afc72e86fff714481f9c2ce796f8782fdb5 (diff) |
fix for sequencer selection and naming in the outliner, was broken since 2.5x
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 097823135f3..ff3648fc2b8 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -897,24 +897,16 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i */ te->idcode = seq->type; te->directdata = seq; + te->name = seq->name + 2; - if (seq->type < 7) { + if (seq->type < SEQ_EFFECT) { /* * This work like the sequence. * If the sequence have a name (not default name) * show it, in other case put the filename. */ - if (strcmp(seq->name, "SQ")) - te->name = seq->name; - else { - if ((seq->strip) && (seq->strip->stripdata)) - te->name = seq->strip->stripdata->name; - else - te->name = "SQ None"; - } if (seq->type == SEQ_META) { - te->name = "Meta Strip"; p = seq->seqbase.first; while (p) { outliner_add_element(soops, &te->subtree, (void *)p, te, TSE_SEQUENCE, index); @@ -924,8 +916,6 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i else outliner_add_element(soops, &te->subtree, (void *)seq->strip, te, TSE_SEQ_STRIP, index); } - else - te->name = "Effect"; } else if (type == TSE_SEQ_STRIP) { Strip *strip = (Strip *)idv; |