diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-16 17:42:49 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-16 17:42:49 +0300 |
| commit | fc61cdf1428dc74f4ef9b834de9082f910ce08e0 (patch) | |
| tree | ba4f4dc67a11c83c3dea90803e578053f0aa734b /source/blender/editors/render/render_preview.c | |
| parent | dd3ae7bad70ecfd466791f371b138b5b958e0a19 (diff) | |
| parent | 0434053f1329384c312fd07812bce48ec9c28f50 (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 f173d19780b..3fb09123131 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, 0); + bfd = BLO_read_from_memory(blend, blend_size, NULL, BLO_READ_SKIP_NONE); if (bfd) { bmain = bfd->main; |