archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-11-30 13:24:17 +11:00
parent 1965db2be2 dd8469608b
commit dc312609dd
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

@@ -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. * \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. * When not-null, this is written into the user preferences.
*/ */
int wm_homefile_read( void wm_homefile_read(
bContext *C, ReportList *reports, bContext *C, ReportList *reports,
bool use_factory_settings, bool use_empty_data, bool use_userdef, bool use_factory_settings, bool use_empty_data, bool use_userdef,
const char *filepath_startup_override, const char *app_template_override) const char *filepath_startup_override, const char *app_template_override)
@@ -988,8 +988,6 @@ int wm_homefile_read(
G.save_over = 0; G.save_over = 0;
wm_file_read_post(C, true, reset_app_template); wm_file_read_post(C, true, reset_app_template);
return true;
} }
/** \name WM History File API /** \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(); 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)) { wm_homefile_read(C, op->reports, use_factory_settings, use_empty_data, use_userdef, filepath, app_template);
if (use_splash) { if (use_splash) {
WM_init_splash(C); WM_init_splash(C);
}
return OPERATOR_FINISHED;
}
else {
return OPERATOR_CANCELLED;
} }
return OPERATOR_FINISHED;
} }
static int wm_homefile_read_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event)) static int wm_homefile_read_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))

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

@@ -35,8 +35,8 @@ struct Main;
struct wmOperatorType; struct wmOperatorType;
/* wm_files.c */ /* wm_files.c */
void wm_history_file_read(void); void wm_history_file_read(void);
int wm_homefile_read( void wm_homefile_read(
struct bContext *C, struct ReportList *reports, struct bContext *C, struct ReportList *reports,
bool use_factory_settings, bool use_empty_data, bool use_userdef, bool use_factory_settings, bool use_empty_data, bool use_userdef,
const char *filepath_startup_override, const char *app_template_override); const char *filepath_startup_override, const char *app_template_override);