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

Cleanup: rename G_FILE_RECOVER -> G_FILE_RECOVER_READ

Browse Source 
No functional changes, make room for a write equivalent.
This commit is contained in:
Campbell Barton
2021-03-15 13:30:26 +11:00
parent 042f06ef3c
commit d3b4ff6eaa
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_global.h
View File

@@ -178,7 +178,7 @@ enum {
* In practice this means recover needs to be passed around to too many low level functions,
* so keep this as a flag.
*/
G_FILE_RECOVER = (1 << 23),
G_FILE_RECOVER_READ = (1 << 23),
/** BMesh option to save as older mesh format */
/* #define G_FILE_MESH_COMPAT (1 << 26) */
/* #define G_FILE_GLSL_NO_ENV_LIGHTING (1 << 28) */ /* deprecated */

2
source/blender/blenkernel/intern/blendfile.c
View File

@@ -140,7 +140,7 @@ static void setup_app_data(bContext *C,
{
Main *bmain = G_MAIN;
Scene *curscene = NULL;
const bool recover = (G.fileflags & G_FILE_RECOVER) != 0;
const bool recover = (G.fileflags & G_FILE_RECOVER_READ) != 0;
const bool is_startup = params->is_startup;
enum {
LOAD_UI = 1,

4
source/blender/blenloader/intern/readfile.c
View File

@@ -3770,7 +3770,7 @@ static BHead *read_global(BlendFileData *bfd, FileData *fd, BHead *bhead)
* (not after loading file). */
if (bfd->filename[0] == 0) {
if (fd->fileversion < 265 || (fd->fileversion == 265 && fg->subversion < 1)) {
if ((G.fileflags & G_FILE_RECOVER) == 0) {
if ((G.fileflags & G_FILE_RECOVER_READ) == 0) {
BLI_strncpy(bfd->filename, BKE_main_blendfile_path(bfd->main), sizeof(bfd->filename));
}
}
@@ -3781,7 +3781,7 @@ static BHead *read_global(BlendFileData *bfd, FileData *fd, BHead *bhead)
}
}
if (G.fileflags & G_FILE_RECOVER) {
if (G.fileflags & G_FILE_RECOVER_READ) {
BLI_strncpy(fd->relabase, fg->filename, sizeof(fd->relabase));
}

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

@@ -2595,9 +2595,9 @@ bool WM_recover_last_session(bContext *C, ReportList *reports)
{
char filepath[FILE_MAX];
BLI_join_dirfile(filepath, sizeof(filepath), BKE_tempdir_base(), BLENDER_QUIT_FILE);
G.fileflags |= G_FILE_RECOVER;
G.fileflags |= G_FILE_RECOVER_READ;
const bool success = wm_file_read_opwrap(C, filepath, reports);
G.fileflags &= ~G_FILE_RECOVER;
G.fileflags &= ~G_FILE_RECOVER_READ;
return success;
}
@@ -2654,11 +2654,11 @@ static int wm_recover_auto_save_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);
G.fileflags |= G_FILE_RECOVER;
G.fileflags |= G_FILE_RECOVER_READ;
success = wm_file_read_opwrap(C, filepath, op->reports);
G.fileflags &= ~G_FILE_RECOVER;
G.fileflags &= ~G_FILE_RECOVER_READ;
if (success) {
if (!G.background) {