Commit: bf9680f0b4a3300d0e62ab31561f6e8ab8fd7bc2
Author: YimingWu
Date: Fri Jun 26 21:26:24 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBbf9680f0b4a3300d0e62ab31561f6e8ab8fd7bc2
Merge remote-tracking branch 'origin/master' into lanpr-under-gp
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index 4c8a3a6741b,122b978fc41..658a2071ddf
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -6170,11 -6171,9 +6172,11 @@@ static void direct_link_collection(Blen
direct_link_view_layer(reader, collection->view_layer);
}
#endif
+
+ BLO_read_data_address(reader, &collection->lanpr);
}
- static void lib_link_collection_data(FileData *fd, Library *lib, Collection
*collection)
+ static void lib_link_collection_data(BlendLibReader *reader, Library *lib,
Collection *collection)
{
for (CollectionObject *cob = collection->gobject.first, *cob_next = NULL;
cob; cob = cob_next) {
cob_next = cob->next;
@@@ -6186,16 -6185,11 +6188,16 @@@
}
for (CollectionChild *child = collection->children.first; child != NULL;
child = child->next) {
- child->collection = newlibadr(fd, lib, child->collection);
+ BLO_read_id_address(reader, lib, &child->collection);
}
+
+ if (collection->lanpr) {
+ collection->lanpr->target = newlibadr(fd, lib, collection->lanpr->target);
+ }
+
}
- static void lib_link_collection(FileData *fd, Main *UNUSED(bmain), Collection
*collection)
+ static void lib_link_collection(BlendLibReader *reader, Collection
*collection)
{
#ifdef USE_COLLECTION_COMPAT_28
if (collection->collection) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
