blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v3.0-release'

This commit is contained in:
Richard Antalik 2021-11-19 06:22:47 +01:00
parent 5ed3a5d023 4d09a692e2
commit b8dc845e57
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenloader/intern/versioning_300.c
View File

@ -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);
}
}
}