diff options
author | Richard Antalik <richardantalik@gmail.com> | 2019-05-31 01:19:02 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2019-05-31 01:47:25 +0300 |
commit | 7ccc7ef61fde38e517d730cef05242cc150126d1 (patch) | |
tree | 22a7eb694b7c96c3deb115595fec379d146a522f /source/blender/blenloader | |
parent | fc336f973d521e61ad6c10fbd67a72d684dbe43a (diff) |
VSE: don't add crop and transform data for sound strips
This also fixes commit rB1fd7b380f4cf8a0489b405de2819f228a4da5ea2 which
didn't do allocation for effect strips properly.
Reviewed By: brecht, campbellbarton
Differential Revision: https://developer.blender.org/D4970
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 66ae743fdcb..315d8f0848d 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -718,16 +718,18 @@ static void do_version_constraints_copy_scale_power(ListBase *lb) static void do_versions_seq_alloc_transform_and_crop(ListBase *seqbase) { for (Sequence *seq = seqbase->first; seq != NULL; seq = seq->next) { - if (seq->strip->transform == NULL) { - seq->strip->transform = MEM_callocN(sizeof(struct StripTransform), "StripTransform"); - } + if (ELEM(seq->type, SEQ_TYPE_SOUND_RAM, SEQ_TYPE_SOUND_HD) == 0) { + if (seq->strip->transform == NULL) { + seq->strip->transform = MEM_callocN(sizeof(struct StripTransform), "StripTransform"); + } - if (seq->strip->crop == NULL) { - seq->strip->crop = MEM_callocN(sizeof(struct StripCrop), "StripCrop"); - } + if (seq->strip->crop == NULL) { + seq->strip->crop = MEM_callocN(sizeof(struct StripCrop), "StripCrop"); + } - if (seq->seqbase.first != NULL) { - do_versions_seq_alloc_transform_and_crop(&seq->seqbase); + if (seq->seqbase.first != NULL) { + do_versions_seq_alloc_transform_and_crop(&seq->seqbase); + } } } } |