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:
authorDalai Felinto <dfelinto@gmail.com>2017-02-16 20:45:41 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-02-16 22:02:35 +0300
commit6d58f1e87d54f2fe5750ef5b44c9b2e9f832498d (patch)
treee184cf448274759a6b7ccea24fee801c69540cda /source/blender/blenloader
parent9f4004261e8d32cb4af994b6f45b5552a9902847 (diff)
Doversion: reset layer collection properties when needed
This prevents crashes when a file was saved with 2.8, but a new engine settings property was created. In those cases any previous collection settings are wiped out. We can do an elegant merge soon.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_280.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 432d8be0a6d..b8867f7b621 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -173,6 +173,11 @@ void do_versions_after_linking_280(Main *main)
}
}
+void blo_do_version_temporary(Main *main)
+{
+ BKE_scene_layer_doversion_update(main);
+}
+
void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
{
if (!MAIN_VERSION_ATLEAST(main, 280, 0)) {
@@ -183,5 +188,9 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
BLI_strncpy(scene->collection->name, "Master Collection", sizeof(scene->collection->name));
}
}
+
+ /* temporary validation of 280 files for layers */
+ blo_do_version_temporary(main);
}
+
}