diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-31 15:40:41 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-31 15:47:08 +0300 |
commit | 8987f7987d8160e1f6e79e8c85d6ce65b885ab25 (patch) | |
tree | 5c01a3a35ce8bb4025b6d5d063351dd5d8699809 /source/blender/blenloader/intern | |
parent | aec28acc751727c9a5a70482b2b9d0800ee2cf47 (diff) |
Fix missing file read/write of proxy/transform/crop settings when not used
This was inconsistent with other data handling in Blender.
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 31 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/writefile.c | 6 |
3 files changed, 12 insertions, 27 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index d08c9f23db1..b2536935663 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6782,29 +6782,14 @@ static void direct_link_scene(FileData *fd, Scene *sce) else { seq->strip->stripdata = NULL; } - if (seq->flag & SEQ_USE_CROP) { - seq->strip->crop = newdataadr(fd, seq->strip->crop); - } - else { - seq->strip->crop = NULL; - } - if (seq->flag & SEQ_USE_TRANSFORM) { - seq->strip->transform = newdataadr(fd, seq->strip->transform); - } - else { - seq->strip->transform = NULL; - } - if (seq->flag & SEQ_USE_PROXY) { - seq->strip->proxy = newdataadr(fd, seq->strip->proxy); - if (seq->strip->proxy) { - seq->strip->proxy->anim = NULL; - } - else { - BKE_sequencer_proxy_set(seq, true); - } - } - else { - seq->strip->proxy = NULL; + seq->strip->crop = newdataadr(fd, seq->strip->crop); + seq->strip->transform = newdataadr(fd, seq->strip->transform); + seq->strip->proxy = newdataadr(fd, seq->strip->proxy); + if (seq->strip->proxy) { + seq->strip->proxy->anim = NULL; + } + else if (seq->flag & SEQ_USE_PROXY) { + BKE_sequencer_proxy_set(seq, true); } /* need to load color balance to it could be converted to modifier */ diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 315d8f0848d..1f543a92c04 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -3495,7 +3495,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - if (!MAIN_VERSION_ATLEAST(bmain, 280, 72)) { + if (!MAIN_VERSION_ATLEAST(bmain, 280, 74)) { for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->ed != NULL) { do_versions_seq_alloc_transform_and_crop(&scene->ed->seqbase); diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 6305aa95e7f..8d83be47f63 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -2580,13 +2580,13 @@ static void write_scene(WriteData *wd, Scene *sce) Strip *strip = seq->strip; writestruct(wd, DATA, Strip, 1, strip); - if (seq->flag & SEQ_USE_CROP && strip->crop) { + if (strip->crop) { writestruct(wd, DATA, StripCrop, 1, strip->crop); } - if (seq->flag & SEQ_USE_TRANSFORM && strip->transform) { + if (strip->transform) { writestruct(wd, DATA, StripTransform, 1, strip->transform); } - if (seq->flag & SEQ_USE_PROXY && strip->proxy) { + if (strip->proxy) { writestruct(wd, DATA, StripProxy, 1, strip->proxy); } if (seq->type == SEQ_TYPE_IMAGE) { |