griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: make group/collection versioning a bit more clear.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-05-18 19:31:35 +02:00
parent f99197fb2d
commit 0d2aa1a7bb
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenloader/intern/readfile.c
View File

@@ -5679,16 +5679,14 @@ static void direct_link_collection(FileData *fd, Collection *collection)
#ifdef USE_COLLECTION_COMPAT_28
/* This runs before the very first doversion. */
collection->collection = newdataadr(fd, collection->collection);
if (collection->collection != NULL) {
collection->collection = newdataadr(fd, collection->collection);
direct_link_scene_collection(fd, collection->collection);
}
collection->view_layer = newdataadr(fd, collection->view_layer);
if (collection->view_layer != NULL) {
collection->view_layer = newdataadr(fd, collection->view_layer);
if (collection->view_layer != NULL) {
direct_link_view_layer(fd, collection->view_layer);
}
direct_link_view_layer(fd, collection->view_layer);
}
#endif
}

1
source/blender/blenloader/intern/versioning_280.c
View File

@@ -297,6 +297,7 @@ static void do_version_group_collection_to_collection(Main *bmain, Collection *g
}
group->collection = NULL;
group->view_layer = NULL;
id_fake_user_set(&group->id);
}