diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-15 20:53:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-15 20:53:07 +0300 |
| commit | 104a03beed67d8f9f51fbe87c00b92ee19e5174f (patch) | |
| tree | 894ee91727794a2e22db87d275b62e01098b0d1c /source/blender/editors/render/render_preview.c | |
| parent | fce0ff0a3134579f5084f8ae61bec3599cc09db1 (diff) | |
| parent | c832354e330c575a5c450cf0febebb7cc058df87 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/render/render_preview.c')
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 2 |
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 7cc3ca79b11..f173d19780b 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -199,7 +199,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); + bfd = BLO_read_from_memory(blend, blend_size, NULL, 0); if (bfd) { bmain = bfd->main; |