diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-03 12:38:17 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-03 12:51:49 +0300 |
commit | 2a8608294597f82add9c69b64bc11b9c492d46ac (patch) | |
tree | a5c67c6f822981daf48daa4228587706b9830328 /source/blender/blenloader | |
parent | 66c74242bba3c2962ff5c3ddc02409171ec86dc3 (diff) |
Validate collection properties at readile
The alternative would be to do version bump + doversioning every
time a new property is added.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b7a8e85a93d..4cb0595dde9 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6297,6 +6297,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) sce->collection_properties = newdataadr(fd, sce->collection_properties); IDP_DirectLinkGroup_OrFree(&sce->collection_properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); + BKE_layer_collection_engine_settings_validate(sce); } /* ************ READ WM ***************** */ diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 476439dfe77..70c35788527 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -212,14 +212,6 @@ void do_versions_after_linking_280(Main *main) } } } - - if (!MAIN_VERSION_ATLEAST(main, 280, 0)) { - IDPropertyTemplate val = {0}; - for (Scene *scene = main->scene.first; scene; scene = scene->id.next) { - scene->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); - BKE_layer_collection_engine_settings_create(scene->collection_properties); - } - } } static void do_version_layer_collections_idproperties(ListBase *lb) |