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/blenloader/BLO_readfile.h | |
parent | 1844ccd5210bf0c57c97b550fd38c2dc141cfb62 (diff) | |
parent | c66570f519fb24e0c3fb724d7b6d38f4b6fd7ffc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/BLO_readfile.h')
-rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index ef02e7d7034..df8cc164869 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -81,6 +81,10 @@ typedef struct WorkspaceConfigFileData { struct ListBase workspaces; } WorkspaceConfigFileData; +struct BlendFileReadParams { + uint skip_flags : 2; /* eBLOReadSkip */ + uint is_startup : 1; +}; /* skip reading some data-block types (may want to skip screen data too). */ typedef enum eBLOReadSkip { @@ -93,13 +97,16 @@ typedef enum eBLOReadSkip { BlendFileData *BLO_read_from_file( const char *filepath, - struct ReportList *reports, eBLOReadSkip skip_flag); + eBLOReadSkip skip_flags, + struct ReportList *reports); BlendFileData *BLO_read_from_memory( const void *mem, int memsize, - struct ReportList *reports, eBLOReadSkip skip_flag); + eBLOReadSkip skip_flags, + struct ReportList *reports); BlendFileData *BLO_read_from_memfile( struct Main *oldmain, const char *filename, struct MemFile *memfile, - struct ReportList *reports, eBLOReadSkip skip_flag); + eBLOReadSkip skip_flags, + struct ReportList *reports); void BLO_blendfiledata_free(BlendFileData *bfd); |