diff options
| author | Julian Eisel <julian@blender.org> | 2022-09-13 16:45:25 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-09-13 16:45:25 +0300 |
| commit | 22580aff76db27c233f9986db54aafc440c7596f (patch) | |
| tree | a4c1b5fc171b33123a040fc35e4671e139f47129 /source/blender/blenkernel/BKE_collection.h | |
| parent | 15ad4334fc95824296f0a617927d1ec5e54a3bc7 (diff) | |
| parent | b6ebd5591c7f0e7037a2af66b5e1d96125834949 (diff) | |
Merge branch 'master' into asset-browser-grid-view
Diffstat (limited to 'source/blender/blenkernel/BKE_collection.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_collection.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h index feb3dc7de80..4346c2a3d23 100644 --- a/source/blender/blenkernel/BKE_collection.h +++ b/source/blender/blenkernel/BKE_collection.h @@ -26,6 +26,7 @@ struct BlendExpander; struct BlendLibReader; struct BlendWriter; struct Collection; +struct ID; struct Library; struct Main; struct Object; @@ -94,7 +95,7 @@ struct Collection *BKE_collection_duplicate(struct Main *bmain, /* Master Collection for Scene */ #define BKE_SCENE_COLLECTION_NAME "Scene Collection" -struct Collection *BKE_collection_master_add(void); +struct Collection *BKE_collection_master_add(struct Scene *scene); /* Collection Objects */ @@ -296,7 +297,9 @@ void BKE_main_collections_parent_relations_rebuild(struct Main *bmain); /* .blend file I/O */ void BKE_collection_blend_write_nolib(struct BlendWriter *writer, struct Collection *collection); -void BKE_collection_blend_read_data(struct BlendDataReader *reader, struct Collection *collection); +void BKE_collection_blend_read_data(struct BlendDataReader *reader, + struct Collection *collection, + struct ID *owner_id); void BKE_collection_blend_read_lib(struct BlendLibReader *reader, struct Collection *collection); void BKE_collection_blend_read_expand(struct BlendExpander *expander, struct Collection *collection); |