diff options
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/undofile.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 34a670a8357..e63b0c1909b 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -142,7 +142,7 @@ void blo_split_main(ListBase *mainlist, struct Main *main); BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath); FileData *blo_filedata_from_file(const char *filepath, struct ReportList *reports); -FileData *blo_filedata_from_memory(const void *buffer, int buffersize, struct ReportList *reports); +FileData *blo_filedata_from_memory(const void *mem, int memsize, struct ReportList *reports); FileData *blo_filedata_from_memfile(struct MemFile *memfile, const struct BlendFileReadParams *params, struct ReportList *reports); diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c index 62ffbcc874b..8ee539014f0 100644 --- a/source/blender/blenloader/intern/undofile.c +++ b/source/blender/blenloader/intern/undofile.c @@ -193,12 +193,12 @@ void BLO_memfile_chunk_add(MemFileWriteData *mem_data, const char *buf, uint siz } struct Main *BLO_memfile_main_get(struct MemFile *memfile, - struct Main *oldmain, + struct Main *bmain, struct Scene **r_scene) { struct Main *bmain_undo = NULL; - BlendFileData *bfd = BLO_read_from_memfile(oldmain, - BKE_main_blendfile_path(oldmain), + BlendFileData *bfd = BLO_read_from_memfile(bmain, + BKE_main_blendfile_path(bmain), memfile, &(const struct BlendFileReadParams){0}, NULL); |