diff options
author | Bastien Montagne <bastien@blender.org> | 2021-06-24 11:53:45 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-06-24 13:10:06 +0300 |
commit | 8cdb99d51c02d5cc60c774c176a43519c046e14c (patch) | |
tree | 0185df926bf3c14905d51a648c1d155cccc4dce1 /source/blender/blenloader/BLO_readfile.h | |
parent | 3a8347f82348ef2f430cdaa8a2e840ad3dba5a71 (diff) |
Fix linking code after own recent commit.
More stupid mistake in recent enhanced reports for file load code,
rB82c17082ba0e left some read-after-free situations.
Diffstat (limited to 'source/blender/blenloader/BLO_readfile.h')
-rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index c2ac2df1f84..52ef577fceb 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -155,7 +155,9 @@ struct BLODataBlockInfo { }; BlendHandle *BLO_blendhandle_from_file(const char *filepath, struct BlendFileReadReport *reports); -BlendHandle *BLO_blendhandle_from_memory(const void *mem, int memsize); +BlendHandle *BLO_blendhandle_from_memory(const void *mem, + int memsize, + struct BlendFileReadReport *reports); struct LinkNode *BLO_blendhandle_get_datablock_names(BlendHandle *bh, int ofblocktype, @@ -260,6 +262,7 @@ typedef struct TempLibraryContext { /** Temporary main used to load data into (currently initialized from `real_main`). */ struct Main *bmain_base; struct BlendHandle *blendhandle; + struct BlendFileReadReport bf_reports; struct LibraryLink_Params liblink_params; struct Library *lib; |