diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-11 03:33:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-11 03:33:39 +0300 |
commit | d1328feeb125328615bcf832cbc82d9f9a18e023 (patch) | |
tree | 9243fcdd057cb7cbc710393158a7c15c41459919 /source/blender/windowmanager/wm_files.h | |
parent | c4201e57f36e7a5bcb711bd1a92d5b334cd40dff (diff) | |
parent | 0398ee10a1b727c63b344db3d6c8d78f6bbfd633 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h index 4fbbe3d2879..6f63e55e8ab 100644 --- a/source/blender/windowmanager/wm_files.h +++ b/source/blender/windowmanager/wm_files.h @@ -37,7 +37,7 @@ struct wmOperatorType; void wm_history_file_read(void); int wm_homefile_read( struct bContext *C, struct ReportList *reports, - bool use_factory_settings, bool use_empty_data, + bool use_factory_settings, bool use_empty_data, bool use_userdef, const char *filepath_startup_override, const char *app_template_override); void wm_file_read_report(bContext *C); |