diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-02-09 17:58:37 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-09 17:58:37 +0400 |
commit | fd145b4df19c70b3133c45b364c58a14d2cf818d (patch) | |
tree | c433e892357138ecc36be104dcf3f94b681dcd20 /source | |
parent | 00212f2b1f24362837910ea578546b3d93eba4e5 (diff) |
omit warning about startup.blend being missing when loading with '--factory-startup'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 2196ce7ba65..45cc48c254a 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -520,14 +520,15 @@ int wm_homefile_read(bContext *C, ReportList *UNUSED(reports), short from_memory /* put aside screens to match with persistent windows later */ wm_window_match_init(C, &wmbase); - if (!from_memory && BLI_exists(startstr)) { - success = (BKE_read_file(C, startstr, NULL) != BKE_READ_FILE_FAIL); - - } - - if (U.themes.first == NULL) { - printf("\nNote: No (valid) "STRINGIFY (BLENDER_STARTUP_FILE)" found, fall back to built-in default.\n\n"); - success = 0; + if (!from_memory) { + if (BLI_exists(startstr)) { + success = (BKE_read_file(C, startstr, NULL) != BKE_READ_FILE_FAIL); + } + + if (U.themes.first == NULL) { + printf("\nNote: No (valid) '%s' found, fall back to built-in default.\n\n", startstr); + success = 0; + } } if (success == 0) { |