diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-06-23 10:51:11 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-06-23 11:37:00 +0300 |
| commit | 82c17082ba0e53d782ac6be703d71d188a331dde (patch) | |
| tree | 3bdb6f1a86bc8bf506d28046ada40b7f881dba86 /source/blender/blenkernel/intern/blender_copybuffer.c | |
| parent | 071799d4fc44f422abacbdad09bb45fb95de89f2 (diff) | |
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...
Diffstat (limited to 'source/blender/blenkernel/intern/blender_copybuffer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender_copybuffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index dfd49a347ca..c8fedc086b8 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -87,7 +87,7 @@ bool BKE_copybuffer_read(Main *bmain_dst, ReportList *reports, const uint64_t id_types_mask) { - BlendHandle *bh = BLO_blendhandle_from_file(libname, reports); + BlendHandle *bh = BLO_blendhandle_from_file(libname, &(BlendFileReadReport){.reports = reports}); if (bh == NULL) { /* Error reports will have been made by BLO_blendhandle_from_file(). */ return false; @@ -133,7 +133,7 @@ int BKE_copybuffer_paste(bContext *C, BlendHandle *bh; const int id_tag_extra = 0; - bh = BLO_blendhandle_from_file(libname, reports); + bh = BLO_blendhandle_from_file(libname, &(BlendFileReadReport){.reports = reports}); if (bh == NULL) { /* error reports will have been made by BLO_blendhandle_from_file() */ |