[Bf-blender-cvs] [63cea2b793d] master: Fix versioning code outside of version check
Richard Antalik
noreply at git.blender.org
Mon Jan 11 10:57:19 CET 2021
Commit: 63cea2b793d0dd98b69cab156ba3be4dcf9f234a
Author: Richard Antalik
Date: Mon Jan 11 10:48:00 2021 +0100
Branches: master
https://developer.blender.org/rB63cea2b793d0dd98b69cab156ba3be4dcf9f234a
Fix versioning code outside of version check
Bug introduced in f448ff2afe7a probably due to mistake when resolving
conflicts and not checking functionality.
===================================================================
M source/blender/blenloader/intern/versioning_290.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index e5e04afc927..61cf7e4ef49 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -1507,15 +1507,15 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
}
- }
- LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
- Editing *ed = SEQ_editing_get(scene, false);
- if (ed == NULL) {
- continue;
+ LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+ Editing *ed = SEQ_editing_get(scene, false);
+ if (ed == NULL) {
+ continue;
+ }
+ ed->cache_flag = (SEQ_CACHE_STORE_RAW | SEQ_CACHE_STORE_FINAL_OUT);
+ do_versions_strip_cache_settings_recursive(&ed->seqbase);
}
- ed->cache_flag = (SEQ_CACHE_STORE_RAW | SEQ_CACHE_STORE_FINAL_OUT);
- do_versions_strip_cache_settings_recursive(&ed->seqbase);
}
/**
More information about the Bf-blender-cvs
mailing list