Commit: dd2ed1c55cf50cbd5640ff00c6991c3c53dcefe0
Author: Bastien Montagne
Date: Mon May 30 16:56:56 2022 +0200
Branches: master
https://developer.blender.org/rBdd2ed1c55cf50cbd5640ff00c6991c3c53dcefe0
Cleanup: report errors instead of asserting in case of missing local data on
file read.
While this should never happen, this is not a critical failure
preventing Blender to work.
===================================================================
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_files.c
b/source/blender/windowmanager/intern/wm_files.c
index bee7e71df54..9578f82d3d4 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -846,8 +846,13 @@ static void file_read_reports_finalize(BlendFileReadReport
*bf_reports)
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->count.missing_obdata != 0 ||
bf_reports->count.missing_obproxies != 0) {
+ CLOG_ERROR(&LOG,
+ "%d local ObjectData and %d local Object proxies are reported
to be missing, "
+ "this should never happen",
+ bf_reports->count.missing_obdata,
+ bf_reports->count.missing_obproxies);
+ }
}
if (bf_reports->resynced_lib_overrides_libraries_count != 0) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
