From 82c17082ba0e53d782ac6be703d71d188a331dde Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 23 Jun 2021 09:51:11 +0200 Subject: Revert "Revert "Enhanced stats/reports for blendfile reading."" This reverts commit rB3a48147b8ab92, and fixes the issues with linking etc. Change compared to previous buggy commit (rBf8d219dfd4c31) is that new `BlendFileReadReports` reports are now passed to the lowest level function generating the `FileData` (`filedata_new()`), which ensures (and asserts) that all code using it does have a valid non-NULL pointer to a `BlendFileReadReport` data. Sorry for the noise, it's always when you think a change is trivial and do not test it well enough that you end up doing those kind of mistakes... --- source/blender/windowmanager/intern/wm_files_link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/windowmanager/intern/wm_files_link.c') diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index c1c5eac8382..f938c507818 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -244,7 +244,7 @@ static void wm_link_do(WMLinkAppendData *lapp_data, bh = BLO_blendhandle_from_memory(datatoc_startup_blend, datatoc_startup_blend_size); } else { - bh = BLO_blendhandle_from_file(libname, reports); + bh = BLO_blendhandle_from_file(libname, &(BlendFileReadReport){.reports = reports}); } if (bh == NULL) { -- cgit v1.2.3