Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: unused return arg

Browse Source
This commit is contained in:
Campbell Barton
2018-11-30 13:21:12 +11:00
parent a8b8da5567
commit dd8469608b
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/windowmanager/intern/wm_files.c
View File

@@ -685,7 +685,7 @@ const char *WM_init_state_app_template_get(void)
* \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)
@@ -921,8 +921,6 @@ int wm_homefile_read(
G.fileflags &= ~G_FILE_AUTOPLAY;
wm_file_read_post(C, true, use_userdef);
return true;
}
/** \name WM History File API
@@ -1672,15 +1670,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;
}
void WM_OT_read_homefile(wmOperatorType *ot)

4
source/blender/windowmanager/wm_files.h
View File

@@ -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);