diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-10-02 18:02:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-10-03 00:25:36 +0300 |
commit | 8cd8b3e9bda443ec8f560117d93a4f06fe91cb11 (patch) | |
tree | 85da60d080519404fc18fc63d17ca733d75ae4a3 /source/blender/blenkernel/BKE_blendfile.h | |
parent | b13459f9e585bcb0e4ba61e391e59a888f5042f2 (diff) |
readfile: always run setup_app_data after updating defaults
When blend files were loaded with app-templates,
setup_app_data was running before defaults were updated.
This is likely to cause problems with order of initialization
so always update the startup file beforehand.
Diffstat (limited to 'source/blender/blenkernel/BKE_blendfile.h')
-rw-r--r-- | source/blender/blenkernel/BKE_blendfile.h | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_blendfile.h b/source/blender/blenkernel/BKE_blendfile.h index 94d203eeb2c..f73c4a70809 100644 --- a/source/blender/blenkernel/BKE_blendfile.h +++ b/source/blender/blenkernel/BKE_blendfile.h @@ -31,16 +31,32 @@ struct ReportList; struct UserDef; struct bContext; -int BKE_blendfile_read(struct bContext *C, - const char *filepath, - const struct BlendFileReadParams *params, - struct ReportList *reports); +bool BKE_blendfile_read_ex(struct bContext *C, + const char *filepath, + const struct BlendFileReadParams *params, + struct ReportList *reports, + /* Extra args. */ + const bool startup_update_defaults, + const char *startup_app_template); +bool BKE_blendfile_read(struct bContext *C, + const char *filepath, + const struct BlendFileReadParams *params, + struct ReportList *reports); + +bool BKE_blendfile_read_from_memory_ex(struct bContext *C, + const void *filebuf, + int filelength, + const struct BlendFileReadParams *params, + struct ReportList *reports, + /* Extra args. */ + const bool startup_update_defaults, + const char *startup_app_template); bool BKE_blendfile_read_from_memory(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, const struct BlendFileReadParams *params, |