diff options
Diffstat (limited to 'source/blender/sequencer/intern/sequencer.c')
-rw-r--r-- | source/blender/sequencer/intern/sequencer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c index a184f727b9e..c6f4d47ac75 100644 --- a/source/blender/sequencer/intern/sequencer.c +++ b/source/blender/sequencer/intern/sequencer.c @@ -171,7 +171,7 @@ static void seq_sequence_free_ex(Scene *scene, } if (seq->sound && do_id_user) { - id_us_min(((ID *)seq->sound)); + id_us_min((ID *)seq->sound); } if (seq->stereo3d_format) { @@ -426,22 +426,22 @@ MetaStack *SEQ_meta_stack_active_get(const Editing *ed) return ed->metastack.last; } -void SEQ_meta_stack_set(const Scene *scene, Sequence *seqm) +void SEQ_meta_stack_set(const Scene *scene, Sequence *dst_seq) { Editing *ed = SEQ_editing_get(scene); /* Clear metastack */ BLI_freelistN(&ed->metastack); - if (seqm != NULL) { + if (dst_seq != NULL) { /* Allocate meta stack in a way, that represents meta hierarchy in timeline. */ - seq_meta_stack_alloc(scene, seqm); - Sequence *meta_parent = seqm; + seq_meta_stack_alloc(scene, dst_seq); + Sequence *meta_parent = dst_seq; while ((meta_parent = seq_sequence_lookup_meta_by_seq(scene, meta_parent))) { seq_meta_stack_alloc(scene, meta_parent); } - SEQ_seqbase_active_set(ed, &seqm->seqbase); - SEQ_channels_displayed_set(ed, &seqm->channels); + SEQ_seqbase_active_set(ed, &dst_seq->seqbase); + SEQ_channels_displayed_set(ed, &dst_seq->channels); } else { /* Go to top level, exiting meta strip. */ @@ -836,7 +836,7 @@ static bool seq_read_lib_cb(Sequence *seq, void *user_data) BlendLibReader *reader = data->reader; Scene *sce = data->scene; - IDP_BlendReadLib(reader, seq->prop); + IDP_BlendReadLib(reader, sce->id.lib, seq->prop); if (seq->ipo) { /* XXX: deprecated - old animation system. */ |