archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T57989: File loaded as startup

Browse Source 
The file contents was used to check if the file was a startup file.

Now pass in an argument from startup loading code instead.
This commit is contained in:
Campbell Barton
2018-11-22 14:57:41 +11:00
parent 968bf0df14
commit c66570f519
10 changed files with 74 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/render/render_preview.c
View File

@@ -196,7 +196,7 @@ static Main *load_main_from_memory(const void *blend, int blend_size)
BlendFileData *bfd;
G.fileflags |= G_FILE_NO_UI;
bfd = BLO_read_from_memory(blend, blend_size, NULL, BLO_READ_SKIP_NONE);
bfd = BLO_read_from_memory(blend, blend_size, BLO_READ_SKIP_NONE, NULL);
if (bfd) {
bmain = bfd->main;