From 059da44fbc30803e019214c852cb2f3b99f97069 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 10 Nov 2021 15:23:15 +0100 Subject: BKE Link/Append: Use BLO's LibraryLink_Params. This allows to reduce signature of several functions, and make it eaiser to integrate more higher-level usages later on. This should be a non-behavioral-change commit. Part of T91414: Unify link/append between WM operators and BPY context manager API, and cleanup usages of `BKE_library_make_local`. --- .../blender/blenkernel/BKE_blendfile_link_append.h | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'source/blender/blenkernel/BKE_blendfile_link_append.h') diff --git a/source/blender/blenkernel/BKE_blendfile_link_append.h b/source/blender/blenkernel/BKE_blendfile_link_append.h index 184f1ef1511..e0e38390a70 100644 --- a/source/blender/blenkernel/BKE_blendfile_link_append.h +++ b/source/blender/blenkernel/BKE_blendfile_link_append.h @@ -25,6 +25,7 @@ extern "C" { struct ID; struct Library; +struct LibraryLink_Params; struct Main; struct ReportList; struct Scene; @@ -34,7 +35,8 @@ struct View3D; typedef struct BlendfileLinkAppendContext BlendfileLinkAppendContext; typedef struct BlendfileLinkAppendContextItem BlendfileLinkAppendContextItem; -BlendfileLinkAppendContext *BKE_blendfile_link_append_context_new(const int flag); +BlendfileLinkAppendContext *BKE_blendfile_link_append_context_new( + struct LibraryLink_Params *params); void BKE_blendfile_link_append_context_free(struct BlendfileLinkAppendContext *lapp_context); void BKE_blendfile_link_append_context_flag_set(struct BlendfileLinkAppendContext *lapp_context, const int flag, @@ -66,25 +68,14 @@ struct ID *BKE_blendfile_link_append_context_item_newid_get( struct BlendfileLinkAppendContext *lapp_context, struct BlendfileLinkAppendContextItem *item); void BKE_blendfile_append(struct BlendfileLinkAppendContext *lapp_context, - struct ReportList *reports, - struct Main *bmain, - struct Scene *scene, - struct ViewLayer *view_layer, - const struct View3D *v3d); + struct ReportList *reports); void BKE_blendfile_link(struct BlendfileLinkAppendContext *lapp_context, - struct ReportList *reports, - struct Main *bmain, - struct Scene *scene, - struct ViewLayer *view_layer, - const struct View3D *v3d); + struct ReportList *reports); void BKE_blendfile_library_relocate(struct BlendfileLinkAppendContext *lapp_context, struct ReportList *reports, struct Library *library, - const bool do_reload, - struct Main *bmain, - struct Scene *scene, - struct ViewLayer *view_layer); + const bool do_reload); #ifdef __cplusplus } -- cgit v1.2.3