diff options
author | YimingWu <xp8110@outlook.com> | 2022-05-23 09:27:26 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2022-05-23 10:32:19 +0300 |
commit | ac344bd027da00d39fc610bb0a04ca231e2e499a (patch) | |
tree | ed1e1cd8816d1438ce8ea60e6dbb907d655a2410 /source/blender/blenloader/intern/versioning_300.c | |
parent | a9de546daabc42cf0f30a8d95a72eaba7c2d82b7 (diff) | |
parent | 0d959dcc53ac40f8c653ae5c11ecaed8503ad6b6 (diff) |
Merge branch 'temp-lineart-contained' into lineart-shadow
Diffstat (limited to 'source/blender/blenloader/intern/versioning_300.c')
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index 2adc012c695..0e0d7ff1d5a 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -1217,6 +1217,15 @@ static bool version_fix_seq_meta_range(Sequence *seq, void *user_data) return true; } +static bool version_merge_still_offsets(Sequence *seq, void *UNUSED(user_data)) +{ + seq->startofs -= seq->startstill; + seq->endofs -= seq->endstill; + seq->startstill = 0; + seq->endstill = 0; + return true; +} + /* Those `version_liboverride_rnacollections_*` functions mimic the old, pre-3.0 code to find * anchor and source items in the given list of modifiers, constraints etc., using only the * `subitem_local` data of the override property operation. @@ -3068,5 +3077,13 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + + /* Merge still offsets into start/end offsets. */ + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { + Editing *ed = SEQ_editing_get(scene); + if (ed != NULL) { + SEQ_for_each_callback(&ed->seqbase, version_merge_still_offsets, NULL); + } + } } } |