[Bf-blender-cvs] [ed00750e0a8] override-recursive-resync: tweak messages further.

[Bastien Montagne]

Commit: ed00750e0a8062edf7f0dd7dac464a646cf9de81
Author: Bastien Montagne
Date:   Mon Jun 14 16:34:12 2021 +0200
Branches: override-recursive-resync
https://developer.blender.org/rBed00750e0a8062edf7f0dd7dac464a646cf9de81

tweak messages further.

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/windowmanager/intern/wm_files.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 493ec94dbc3..ae590724fe9 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5615,16 +5615,6 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
     mainptr->curlib->filedata = NULL;
   }
   BKE_main_free(main_newid);
-
-  if (basefd->reports != NULL && (basefd->reports->num_missing_libraries != 0 ||
-                                  basefd->reports->num_missing_linked_id != 0)) {
-    BKE_reportf(basefd->reports->reports,
-                RPT_WARNING,
-                "LIB: %d libraries and %d linked data-blocks are missing, please check the "
-                "Info and Outliner editors for details",
-                basefd->reports->num_missing_libraries,
-                basefd->reports->num_missing_linked_id);
-  }
 }
 
 void *BLO_read_get_new_data_address(BlendDataReader *reader, const void *old_address)
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index e015dceb804..29e3e0a1a7a 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -822,40 +822,56 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
       const int duration_lib_override_recursive_resync_minutes = (int)floor(
           bf_reports.duration_lib_overrides_recursive_resync / 60.0);
 
-      BKE_reportf(
-          reports,
-          RPT_INFO,
-          "Blender file read in %d min %.2f sec (loading libraries: %d min %.2f sec, applying "
-          "overrides: %d min %.2f sec, resyncing overrides: %d min %.2f sec (%d root "
-          "overrides), among which recursive resync of overrides: %d min %.2f sec)",
-          duration_whole_minutes,
-          bf_reports.duration_whole - (duration_whole_minutes * 60.0),
-          duration_libraries_minutes,
-          bf_reports.duration_libraries - (duration_libraries_minutes * 60.0),
-          duration_lib_override_minutes,
-          bf_reports.duration_lib_overrides - (duration_lib_override_minutes * 60.0),
-          duration_lib_override_resync_minutes,
-          bf_reports.duration_lib_overrides_resync - (duration_lib_override_resync_minutes * 60.0),
-          bf_reports.num_resynced_lib_overrides,
-          duration_lib_override_recursive_resync_minutes,
-          bf_reports.duration_lib_overrides_recursive_resync -
-              (duration_lib_override_recursive_resync_minutes * 60.0));
+      BKE_reportf(reports,
+                  RPT_INFO,
+                  "Blender file read in %dm%.2fs",
+                  duration_whole_minutes,
+                  bf_reports.duration_whole - (duration_whole_minutes * 60.0));
+      BKE_reportf(reports,
+                  RPT_INFO,
+                  " * Loading libraries: %dm%.2fs",
+                  duration_libraries_minutes,
+                  bf_reports.duration_libraries - (duration_libraries_minutes * 60.0));
+      BKE_reportf(reports,
+                  RPT_INFO,
+                  " * Applying overrides: %dm%.2fs",
+                  duration_lib_override_minutes,
+                  bf_reports.duration_lib_overrides - (duration_lib_override_minutes * 60.0));
+      BKE_reportf(reports,
+                  RPT_INFO,
+                  " * Resyncing overrides: %dm%.2fs (%d root overrides), including recursive "
+                  "resyncs: %dm%.2fs)",
+                  duration_lib_override_resync_minutes,
+                  bf_reports.duration_lib_overrides_resync -
+                      (duration_lib_override_resync_minutes * 60.0),
+                  bf_reports.num_resynced_lib_overrides,
+                  duration_lib_override_recursive_resync_minutes,
+                  bf_reports.duration_lib_overrides_recursive_resync -
+                      (duration_lib_override_recursive_resync_minutes * 60.0));
       if (bf_reports.num_resynced_lib_overrides_libraries != 0) {
         for (LinkNode *node_lib = bf_reports.libraries_recursive_linked; node_lib != NULL;
              node_lib = node_lib->next) {
           Library *library = node_lib->link;
           BKE_reportf(reports, RPT_INFO, "Library %s needs overrides resync.", library->filepath);
         }
+      }
+      if (bf_reports.num_missing_libraries != 0 || bf_reports.num_missing_linked_id != 0) {
+        BKE_reportf(reports,
+                    RPT_WARNING,
+                    "%d libraries and %d linked data-blocks are missing, please check the "
+                    "Info and Outliner editors for details",
+                    bf_reports.num_missing_libraries,
+                    bf_reports.num_missing_linked_id);
+      }
+      if (bf_reports.num_resynced_lib_overrides_libraries != 0) {
         BKE_reportf(reports,
                     RPT_WARNING,
-                    "%d libraries have overrides needing resync, this costed %d min %.2f seconds "
-                    "of the total %d min %.2f sec file reading.",
+                    "%d libraries have overrides needing resync (auto resynced in %dm%.2fs),  "
+                    "please check the Info editor for details",
                     bf_reports.num_resynced_lib_overrides_libraries,
                     duration_lib_override_recursive_resync_minutes,
                     bf_reports.duration_lib_overrides_recursive_resync -
-                        (duration_lib_override_recursive_resync_minutes * 60.0),
-                    duration_whole_minutes,
-                    bf_reports.duration_whole - (duration_whole_minutes * 60.0));
+                        (duration_lib_override_recursive_resync_minutes * 60.0));
       }
 
       BLI_linklist_free(bf_reports.libraries_recursive_linked, NULL);