Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-22 06:57:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-22 07:06:14 +0300
commitc66570f519fb24e0c3fb724d7b6d38f4b6fd7ffc (patch)
tree78d0c03da4ada3bfb64e39b8f686a419f2c84395 /source/blender/editors/render/render_preview.c
parent968bf0df148c6fac7567860a64433daa97d042c9 (diff)
Fix T57989: File loaded as startup
The file contents was used to check if the file was a startup file. Now pass in an argument from startup loading code instead.
Diffstat (limited to 'source/blender/editors/render/render_preview.c')
-rw-r--r--source/blender/editors/render/render_preview.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index e1042f17229..a8069b01026 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -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;