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/blenkernel/BKE_blendfile.h | |
parent | 1844ccd5210bf0c57c97b550fd38c2dc141cfb62 (diff) | |
parent | c66570f519fb24e0c3fb724d7b6d38f4b6fd7ffc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_blendfile.h')
-rw-r--r-- | source/blender/blenkernel/BKE_blendfile.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_blendfile.h b/source/blender/blenkernel/BKE_blendfile.h index 305b7d07e4d..e272fcaa3ec 100644 --- a/source/blender/blenkernel/BKE_blendfile.h +++ b/source/blender/blenkernel/BKE_blendfile.h @@ -34,6 +34,7 @@ struct Main; struct MemFile; struct ReportList; struct UserDef; +struct BlendFileReadParams; enum { BKE_BLENDFILE_READ_FAIL = 0, /* no load */ @@ -43,13 +44,16 @@ enum { int BKE_blendfile_read( struct bContext *C, const char *filepath, - struct ReportList *reports, int skip_flag); + const struct BlendFileReadParams *params, + struct ReportList *reports); bool BKE_blendfile_read_from_memory( - struct bContext *C, const void *filebuf, int filelength, - struct ReportList *reports, int skip_flag, bool update_defaults); + struct bContext *C, const void *filebuf, int filelength, bool update_defaults, + const struct BlendFileReadParams *params, + struct ReportList *reports); bool BKE_blendfile_read_from_memfile( struct bContext *C, struct MemFile *memfile, - struct ReportList *reports, int skip_flag); + const struct BlendFileReadParams *params, + struct ReportList *reports); void BKE_blendfile_read_make_empty(struct bContext *C); struct UserDef *BKE_blendfile_userdef_read( |