blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: use 'WM_file_' prefix for file operations

This commit is contained in:
Campbell Barton 2022-03-10 11:33:31 +11:00
parent 1829232598
commit 36dd3f42bc
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_userdef.c
View File

@ -638,7 +638,7 @@ static void rna_userdef_autosave_update(Main *bmain, Scene *scene, PointerRNA *p
wmWindowManager *wm = bmain->wm.first;
if (wm) {
WM_autosave_init(wm);
WM_file_autosave_init(wm);
}
rna_userdef_update(bmain, scene, ptr);
}

7
source/blender/windowmanager/WM_api.h
View File

@ -242,11 +242,12 @@ void WM_window_set_dpi(const wmWindow *win);
bool WM_stereo3d_enabled(struct wmWindow *win, bool only_fullscreen_test);
/* files */
/* wm_files.c */
void WM_file_autoexec_init(const char *filepath);
bool WM_file_read(struct bContext *C, const char *filepath, struct ReportList *reports);
void WM_autosave_init(struct wmWindowManager *wm);
bool WM_recover_last_session(struct bContext *C, struct ReportList *reports);
void WM_file_autosave_init(struct wmWindowManager *wm);
bool WM_file_recover_last_session(struct bContext *C, struct ReportList *reports);
void WM_file_tag_modified(void);
/**

2
source/blender/windowmanager/intern/wm.c
View File

@ -484,7 +484,7 @@ void WM_check(bContext *C)
/* Case: file-read. */
if ((wm->initialized & WM_WINDOW_IS_INIT) == 0) {
WM_keyconfig_init(C);
WM_autosave_init(wm);
WM_file_autosave_init(wm);
}
/* Case: no open windows at all, for old file reads. */

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

@ -1966,7 +1966,7 @@ void wm_autosave_timer_end(wmWindowManager *wm)
}
}
void WM_autosave_init(wmWindowManager *wm)
void WM_file_autosave_init(wmWindowManager *wm)
{
wm_autosave_timer_begin(wm);
}
@ -2860,7 +2860,7 @@ void WM_OT_revert_mainfile(wmOperatorType *ot)
/** \name Recover Last Session Operator
* \{ */
bool WM_recover_last_session(bContext *C, ReportList *reports)
bool WM_file_recover_last_session(bContext *C, ReportList *reports)
{
char filepath[FILE_MAX];
BLI_join_dirfile(filepath, sizeof(filepath), BKE_tempdir_base(), BLENDER_QUIT_FILE);
@ -2874,7 +2874,7 @@ static int wm_recover_last_session_exec(bContext *C, wmOperator *op)
{
wm_open_init_use_scripts(op, true);
SET_FLAG_FROM_TEST(G.f, RNA_boolean_get(op->ptr, "use_scripts"), G_FLAG_SCRIPT_AUTOEXEC);
if (WM_recover_last_session(C, op->reports)) {
if (WM_file_recover_last_session(C, op->reports)) {
if (!G.background) {
wmOperatorType *ot = op->type;
PointerRNA *props_ptr = MEM_callocN(sizeof(PointerRNA), __func__);