[Bf-blender-cvs] [4abc7e72a7a] soc-2020-info-editor: Merge branch 'master' into soc-2020-info-editor

[Mateusz Grzeliński]

Commit: 4abc7e72a7acd72fd396d30bbb5d2c101e4bb7f0
Author: Mateusz Grzeliński
Date:   Mon Jul 13 16:47:46 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB4abc7e72a7acd72fd396d30bbb5d2c101e4bb7f0

Merge branch 'master' into soc-2020-info-editor

# Conflicts:
#	source/blender/windowmanager/intern/wm_files.c

===================================================================



===================================================================

diff --cc source/blender/windowmanager/intern/wm_files.c
index 1cb80380565,f431a6f431b..1e489124a9a
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -1023,18 -1025,11 +1023,14 @@@ void wm_homefile_read(struct bContext *
                                         .is_startup = true,
                                         .skip_flags = skip_flags | BLO_READ_SKIP_USERDEF,
                                     },
 -                                   NULL);
 +                                   reports);
      }
-     if (BLI_listbase_is_empty(&U.themes)) {
-       CLOG_VERBOSE(WM_LOG_SESSION,
-                    1,
-                    "Note: No (valid) '%s' found, fall back to built-in default",
-                    filepath_startup);
-       success = false;
-     }
      if (success) {
        if (update_defaults) {
          if (use_data) {
++          CLOG_INFO(WM_LOG_SESSION,
++                    "No (valid) '%s' found, fall back to built-in default",
++                    filepath_startup);
            BLO_update_defaults_startup_blend(CTX_data_main(C), app_template);
          }
        }