diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 05:24:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 05:24:17 +0300 |
commit | dc312609dd346e40f106976fe1ac5d9ad99e8c20 (patch) | |
tree | 422189e0333115777cc999de35ef9486af1c6663 /source/blender/windowmanager/wm_files.h | |
parent | 1965db2be20f3ea3cdafcfe55dd8708897f850a9 (diff) | |
parent | dd8469608bc80369929cc7ddb95b553ecbe20e88 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/wm_files.h')
-rw-r--r-- | source/blender/windowmanager/wm_files.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h index 147ed882966..465abf011fa 100644 --- a/source/blender/windowmanager/wm_files.h +++ b/source/blender/windowmanager/wm_files.h @@ -35,8 +35,8 @@ struct Main; struct wmOperatorType; /* wm_files.c */ -void wm_history_file_read(void); -int wm_homefile_read( +void wm_history_file_read(void); +void wm_homefile_read( struct bContext *C, struct ReportList *reports, bool use_factory_settings, bool use_empty_data, bool use_userdef, const char *filepath_startup_override, const char *app_template_override); |