diff options
author | Richard Antalik <richardantalik@gmail.com> | 2021-11-19 08:22:47 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2021-11-19 08:22:47 +0300 |
commit | b8dc845e5733a281e86e9ecc0fac5580699a14e1 (patch) | |
tree | b8642bc821e42408faa41d3e8b0b4b44c860e8b6 /source/blender/blenloader | |
parent | 5ed3a5d0237949411fe403c9a1cbb5a53a685f69 (diff) | |
parent | 4d09a692e22add0a8341916d2d79a594bff076a3 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index b8004f60c59..8156c83233a 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -68,6 +68,7 @@ #include "SEQ_iterator.h" #include "SEQ_sequencer.h" +#include "SEQ_time.h" #include "RNA_access.h" @@ -1284,6 +1285,15 @@ static void version_node_tree_socket_id_delim(bNodeTree *ntree) } } +static bool version_fix_seq_meta_range(Sequence *seq, void *user_data) +{ + Scene *scene = (Scene *)user_data; + if (seq->type == SEQ_TYPE_META) { + SEQ_time_update_meta_strip_range(scene, seq); + } + return true; +} + /* NOLINTNEXTLINE: readability-function-size */ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) { @@ -2213,5 +2223,14 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { + Editing *ed = SEQ_editing_get(scene); + /* Make sure range of meta strips is correct. + * It was possible to save .blend file with incorrect state of meta strip + * range. The root cause is expected to be fixed, but need to ensure files + * with invalid meta strip range are corrected. */ + SEQ_for_each_callback(&ed->seqbase, version_fix_seq_meta_range, scene); + } } } |