diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-22 07:16:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-22 07:16:45 +0300 |
| commit | 4b9d242be53203dfa6dc8cd86aef79cce24bc00a (patch) | |
| tree | d772c35aedf986633f16c6bdc5312278f58cb36d /source/blender/editors/render/render_preview.c | |
| parent | 1844ccd5210bf0c57c97b550fd38c2dc141cfb62 (diff) | |
| parent | c66570f519fb24e0c3fb724d7b6d38f4b6fd7ffc (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 1c2aa4537e9..ad2caead1e6 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -207,7 +207,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; |