diff options
author | Joseph Eagar <joeedh@gmail.com> | 2021-08-06 22:51:18 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2021-08-06 22:51:18 +0300 |
commit | 8ed4c5fc61b6fd78dea219f62644faf7e05650bc (patch) | |
tree | e7416bb4f2d89aa10138fdd7b69f2abbc5d849bf /source/blender/windowmanager/intern/wm_files.c | |
parent | 76bd253be73370145404aa4e31139911d9afb579 (diff) | |
parent | 3fab16fe8eb4a99607e00d5716ba88bf24020354 (diff) |
Merge branch 'master' into temp_bmesh_multires
Also fixed a pbvh corruption bug
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index e0e5d890e6c..1a7c254996e 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -797,6 +797,7 @@ static void file_read_reports_finalize(BlendFileReadReport *bf_reports) bf_reports->count.resynced_lib_overrides, duration_lib_override_recursive_resync_minutes, duration_lib_override_recursive_resync_seconds); + if (bf_reports->resynced_lib_overrides_libraries_count != 0) { for (LinkNode *node_lib = bf_reports->resynced_lib_overrides_libraries; node_lib != NULL; node_lib = node_lib->next) { @@ -805,14 +806,22 @@ static void file_read_reports_finalize(BlendFileReadReport *bf_reports) bf_reports->reports, RPT_INFO, "Library %s needs overrides resync.", library->filepath); } } + if (bf_reports->count.missing_libraries != 0 || bf_reports->count.missing_linked_id != 0) { BKE_reportf(bf_reports->reports, RPT_WARNING, - "%d libraries and %d linked data-blocks are missing, please check the " - "Info and Outliner editors for details", + "%d libraries and %d linked data-blocks are missing (including %d ObjectData and " + "%d Proxies), please check the Info and Outliner editors for details", bf_reports->count.missing_libraries, - bf_reports->count.missing_linked_id); + bf_reports->count.missing_linked_id, + bf_reports->count.missing_obdata, + bf_reports->count.missing_obproxies); } + else { + BLI_assert(bf_reports->count.missing_obdata == 0); + BLI_assert(bf_reports->count.missing_obproxies == 0); + } + if (bf_reports->resynced_lib_overrides_libraries_count != 0) { BKE_reportf(bf_reports->reports, RPT_WARNING, |