Load user-preferences before startup file

Internal change needed for template support.
Loading the user preferences first so it's possible
for preferences to control startup behavior.

In general it's useful to load preferences before data-files,
so we know security settings for eg.

1 files changed, 6 insertions, 5 deletions

diff --git a/source/blender/blenkernel/BKE_blendfile.h b/source/blender/blenkernel/BKE_blendfile.h
index 6767fce3abd..6e6d1455b21 100644
--- a/source/blender/blenkernel/BKE_blendfile.h
+++ b/source/blender/blenkernel/BKE_blendfile.h
@@ -34,20 +34,21 @@ struct Main;
 struct MemFile;
 struct ReportList;
 
-int BKE_blendfile_read(struct bContext *C, const char *filepath, struct ReportList *reports);
-
 enum {
 	BKE_BLENDFILE_READ_FAIL             = 0, /* no load */
 	BKE_BLENDFILE_READ_OK               = 1, /* OK */
 	BKE_BLENDFILE_READ_OK_USERPREFS     = 2, /* OK, and with new user settings */
 };
 
+int BKE_blendfile_read(
+        struct bContext *C, const char *filepath,
+        struct ReportList *reports, int skip_flag);
 bool BKE_blendfile_read_from_memory(
-        struct bContext *C, const void *filebuf,
-        int filelength, struct ReportList *reports, bool update_defaults);
+        struct bContext *C, const void *filebuf, int filelength,
+        struct ReportList *reports, int skip_flag, bool update_defaults);
 bool BKE_blendfile_read_from_memfile(
         struct bContext *C, struct MemFile *memfile,
-        struct ReportList *reports);
+        struct ReportList *reports, int skip_flag);
 
 int BKE_blendfile_read_userdef(const char *filepath, struct ReportList *reports);
 int BKE_blendfile_write_userdef(const char *filepath, struct ReportList *reports);