diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile_tempload.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile_tempload.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile_tempload.c b/source/blender/blenloader/intern/readfile_tempload.c index 691d8f542ab..4566e1e9b4d 100644 --- a/source/blender/blenloader/intern/readfile_tempload.c +++ b/source/blender/blenloader/intern/readfile_tempload.c @@ -21,6 +21,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_string.h" + +#include "BKE_main.h" #include "BKE_report.h" #include "DNA_ID.h" @@ -32,15 +35,20 @@ TempLibraryContext *BLO_library_temp_load_id(struct Main *real_main, struct ReportList *reports) { TempLibraryContext *temp_lib_ctx = MEM_callocN(sizeof(*temp_lib_ctx), __func__); + temp_lib_ctx->bmain_base = BKE_main_new(); + + /* Copy the file path so any path remapping is performed properly. */ + STRNCPY(temp_lib_ctx->bmain_base->name, real_main->name); temp_lib_ctx->blendhandle = BLO_blendhandle_from_file(blend_file_path, reports); - BLO_library_link_params_init(&temp_lib_ctx->liblink_params, real_main, 0, LIB_TAG_TEMP_MAIN); + BLO_library_link_params_init( + &temp_lib_ctx->liblink_params, temp_lib_ctx->bmain_base, 0, LIB_TAG_TEMP_MAIN); - temp_lib_ctx->temp_main = BLO_library_link_begin( + temp_lib_ctx->bmain_lib = BLO_library_link_begin( &temp_lib_ctx->blendhandle, blend_file_path, &temp_lib_ctx->liblink_params); - temp_lib_ctx->temp_id = BLO_library_link_named_part(temp_lib_ctx->temp_main, + temp_lib_ctx->temp_id = BLO_library_link_named_part(temp_lib_ctx->bmain_lib, &temp_lib_ctx->blendhandle, idcode, idname, @@ -51,8 +59,13 @@ TempLibraryContext *BLO_library_temp_load_id(struct Main *real_main, void BLO_library_temp_free(TempLibraryContext *temp_lib_ctx) { + /* This moves the temporary ID and any indirectly loaded data into `bmain_base` + * only to free `bmain_base`, while redundant this is the typical code-path for library linking, + * it's more convenient to follow this convention rather than create a new code-path for this + * one-off use case. */ BLO_library_link_end( - temp_lib_ctx->temp_main, &temp_lib_ctx->blendhandle, &temp_lib_ctx->liblink_params); + temp_lib_ctx->bmain_lib, &temp_lib_ctx->blendhandle, &temp_lib_ctx->liblink_params); BLO_blendhandle_close(temp_lib_ctx->blendhandle); + BKE_main_free(temp_lib_ctx->bmain_base); MEM_freeN(temp_lib_ctx); } |