diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-22 02:40:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-22 02:40:51 +0300 |
commit | 9541ce2c261b4d97f1359c930bfe39059f37577e (patch) | |
tree | 2f195d43619f2e6389066ed365fca541ee453d42 /source/blender/blenloader | |
parent | 536c3b6578fbe403bd34827066c23d777d92e22b (diff) |
Missed last commit
Harmless but not renamed as intended.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index e343c421a39..8eaff8e1b0f 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -369,7 +369,7 @@ BlendFileData *BLO_read_from_memfile( FileData *fd; ListBase old_mainlist; - fd = blo_openblendermemfile(memfile, reports); + fd = blo_filedata_from_memfile(memfile, reports); if (fd) { fd->reports = reports; fd->skip_flags = skip_flags; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 208c4e7e300..d52111da1e0 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1263,7 +1263,7 @@ FileData *blo_filedata_from_memory(const void *mem, int memsize, ReportList *rep } } -FileData *blo_openblendermemfile(MemFile *memfile, ReportList *reports) +FileData *blo_filedata_from_memfile(MemFile *memfile, ReportList *reports) { if (!memfile) { BKE_report(reports, RPT_WARNING, "Unable to open blend <memory>"); diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 824584d8305..2dcc65a2074 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -124,7 +124,7 @@ 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_openblendermemfile(struct MemFile *memfile, struct ReportList *reports); +FileData *blo_filedata_from_memfile(struct MemFile *memfile, struct ReportList *reports); void blo_clear_proxy_pointers_from_lib(struct Main *oldmain); void blo_make_image_pointer_map(FileData *fd, struct Main *oldmain); |