[Bf-blender-cvs] [7ead8f6a3c2] soc-2020-info-editor: Merge branch 'show-reports-from-startup' into soc-2020-info-editor

Mateusz Grzeliński noreply at git.blender.org
Sun Jul 5 16:06:31 CEST 2020


Commit: 7ead8f6a3c20cd241a0806cc027e643dcebf1a41
Author: Mateusz Grzeliński
Date:   Sun Jul 5 16:04:35 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB7ead8f6a3c20cd241a0806cc027e643dcebf1a41

Merge branch 'show-reports-from-startup' into soc-2020-info-editor

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



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

diff --cc source/blender/windowmanager/intern/wm_files.c
index bd85937af6e,f13b41799e5..8d49c8b0de9
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -1026,13 -1025,13 +1026,13 @@@ 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)) {
 -      if (G.debug & G_DEBUG) {
 -        printf("\nNote: No (valid) '%s' found, fall back to built-in default.\n\n",
 -               filepath_startup);
 -      }
 +      CLOG_INFO(WM_LOG_SESSION,
 +                1,
 +                "Note: No (valid) '%s' found, fall back to built-in default",
 +                filepath_startup);
        success = false;
      }
      if (success) {
@@@ -1408,8 -1407,9 +1408,9 @@@ bool write_crash_blend(void
  
    BLI_strncpy(path, BKE_main_blendfile_path_from_global(), sizeof(path));
    BLI_path_extension_replace(path, sizeof(path), "_crash.blend");
+   // todo add reports and print them in log
    if (BLO_write_file(G_MAIN, path, G.fileflags, &(const struct BlendFileWriteParams){0}, NULL)) {
 -    printf("written: %s\n", path);
 +    CLOG_INFO(WM_LOG_SESSION, 0, "Saving file ok: %s", path);
      return 1;
    }
    else {



More information about the Bf-blender-cvs mailing list