Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Trickey <howard.trickey@gmail.com>2020-10-24 20:53:16 +0300
committerHoward Trickey <howard.trickey@gmail.com>2020-10-24 20:53:16 +0300
commitd65e5e8bc56858997073e960d8aea7112aaaa384 (patch)
tree23012ef9b1eeb32e4992eb107afc4ba3ceb7dd14
parent70cc0d7121aa70894bb98bb6ae25f8c461918350 (diff)
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).
-rw-r--r--source/blender/blenloader/intern/versioning_290.c14
1 files changed, 6 insertions, 8 deletions
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;
}
}
}