griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

WM: move prints for loading startup & preferences to logging

Browse Source 
Now messages for loading the preferences are logged instead of printed,
with additional logging for the startup file.
Access with the argument --log "wm.files"

Custom command-line actions would print that the preferences were
loading which distracts from the commands output.

Regular blend files loading still prints a message.
This commit is contained in:
Campbell Barton
2024-03-08 13:27:27 +11:00
parent 20b5908af8
commit 75b6dbd132
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1310,11 +1310,12 @@ void wm_homefile_read_ex(bContext *C,
else if (!use_factory_settings && BLI_exists(filepath_userdef)) {
UserDef *userdef = BKE_blendfile_userdef_read(filepath_userdef, nullptr);
if (userdef != nullptr) {
CLOG_INFO(&LOG, 0, "read prefs: \"%s\"", filepath_userdef);
BKE_blender_userdef_data_set_and_free(userdef);
userdef = nullptr;
skip_flags |= BLO_READ_SKIP_USERDEF;
printf("Read prefs: \"%s\"\n", filepath_userdef);
}
}
}
@@ -1365,6 +1366,8 @@ void wm_homefile_read_ex(bContext *C,
BlendFileData *bfd = BKE_blendfile_read(filepath_startup, &params, &bf_reports);
if (bfd != nullptr) {
CLOG_INFO(&LOG, 0, "read startup: \"%s\"", filepath_startup);
/* Frees the current main and replaces it with the new one read from file. */
BKE_blendfile_read_setup_readfile(C,
bfd,
@@ -1439,6 +1442,9 @@ void wm_homefile_read_ex(bContext *C,
/* just avoids missing file warning */
if (BLI_exists(temp_path)) {
userdef_template = BKE_blendfile_userdef_read(temp_path, nullptr);
if (userdef_template) {
CLOG_INFO(&LOG, 0, "read prefs from app-template: \"%s\"", temp_path);
}
}
if (userdef_template == nullptr) {
/* we need to have preferences load to overwrite preferences from previous template */