[Bf-blender-cvs] [d65e5e8bc56] blender-v2.91-release: Fix T82019 Crash loading 2.78 splash demo.
Howard Trickey
noreply at git.blender.org
Sat Oct 24 19:54:05 CEST 2020
Commit: d65e5e8bc56858997073e960d8aea7112aaaa384
Author: Howard Trickey
Date: Sat Oct 24 13:53:16 2020 -0400
Branches: blender-v2.91-release
https://developer.blender.org/rBd65e5e8bc56858997073e960d8aea7112aaaa384
Fix T82019 Crash loading 2.78 splash demo.
The versioning code to default to old booleans for old files was
faulty because really old files had a 'solver' field (later removed,
but then added back for new booleans).
===================================================================
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 00085cb7d59..eeb0dd336a3 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -705,14 +705,12 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
/* Solver and Collections for Boolean. */
- if (!DNA_struct_elem_find(fd->filesdna, "BooleanModifierData", "char", "solver")) {
- for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
- LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
- if (md->type == eModifierType_Boolean) {
- BooleanModifierData *bmd = (BooleanModifierData *)md;
- bmd->solver = eBooleanModifierSolver_Fast;
- bmd->flag = eBooleanModifierFlag_Object;
- }
+ for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
+ LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
+ if (md->type == eModifierType_Boolean) {
+ BooleanModifierData *bmd = (BooleanModifierData *)md;
+ bmd->solver = eBooleanModifierSolver_Fast;
+ bmd->flag = eBooleanModifierFlag_Object;
}
}
}
More information about the Bf-blender-cvs
mailing list