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 | |
parent | 1965db2be20f3ea3cdafcfe55dd8708897f850a9 (diff) | |
parent | dd8469608bc80369929cc7ddb95b553ecbe20e88 (diff) |
Merge branch 'master' into blender2.8
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 16 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_files.h | 4 |
2 files changed, 7 insertions, 13 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 1e714f1dfb4..8c263461af6 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -733,7 +733,7 @@ static bool wm_app_template_has_userpref(const char *app_template) * \param app_template_override: Template to use instead of the template defined in user-preferences. * When not-null, this is written into the user preferences. */ -int wm_homefile_read( +void wm_homefile_read( bContext *C, ReportList *reports, bool use_factory_settings, bool use_empty_data, bool use_userdef, const char *filepath_startup_override, const char *app_template_override) @@ -988,8 +988,6 @@ int wm_homefile_read( G.save_over = 0; wm_file_read_post(C, true, reset_app_template); - - return true; } /** \name WM History File API @@ -1743,15 +1741,11 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op) app_template = WM_init_state_app_template_get(); } - if (wm_homefile_read(C, op->reports, use_factory_settings, use_empty_data, use_userdef, filepath, app_template)) { - if (use_splash) { - WM_init_splash(C); - } - return OPERATOR_FINISHED; - } - else { - return OPERATOR_CANCELLED; + wm_homefile_read(C, op->reports, use_factory_settings, use_empty_data, use_userdef, filepath, app_template); + if (use_splash) { + WM_init_splash(C); } + return OPERATOR_FINISHED; } static int wm_homefile_read_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event)) 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); |