blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Missed last commit 

Harmless but not renamed as intended.
This commit is contained in:
Campbell Barton 2019-02-22 10:40:17 +11:00
parent 536c3b6578
commit 9541ce2c26
Notes: blender-bot 2023-02-14 03:36:37 +01:00 
Referenced by issue #61982, Subdivide in Sculpt Mode Crash bug
Referenced by issue #61876, Objects not rendering with eevee
Referenced by issue #61880, massively increased .blend load times
Referenced by issue #61859, Workbench render - Hair distorts in random shapes
Referenced by issue #61845, BMesh booleans fail with holes
Referenced by issue #61854, Blender 2.80 Grease Pencil surface offset by viewport distance instead of geometry surface
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/readblenentry.c
View File

@ -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;

2
source/blender/blenloader/intern/readfile.c
View File

@ -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>");

2
source/blender/blenloader/intern/readfile.h
View File

@ -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);