Commit: bb0e29c922df43e13cfe5d18928c6ae2b942a945
Author: Bastien Montagne
Date: Fri Aug 13 16:26:58 2021 +0200
Branches: master
https://developer.blender.org/rBbb0e29c922df43e13cfe5d18928c6ae2b942a945
Blendloader: Option to reports to skip list of recursively liboverride-resynced
libs.
This extra info is not always needed/convinient to use, and requires
special attention to free the list, so allow not generating it.
===================================================================
M source/blender/blenkernel/intern/lib_override.c
M source/blender/blenloader/BLO_readfile.h
===================================================================
diff --git a/source/blender/blenkernel/intern/lib_override.c
b/source/blender/blenkernel/intern/lib_override.c
index bebc49e090d..8083585b594 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -1631,7 +1631,7 @@ static void
lib_override_library_main_resync_on_library_indirect_level(
CLOG_INFO(&LOG, 2, "\tSuccess: %d", success);
if (success) {
reports->count.resynced_lib_overrides++;
- if (library_indirect_level > 0 &&
+ if (library_indirect_level > 0 &&
reports->do_resynced_lib_overrides_libraries_list &&
BLI_linklist_index(reports->resynced_lib_overrides_libraries,
library) < 0) {
BLI_linklist_prepend(&reports->resynced_lib_overrides_libraries,
library);
reports->resynced_lib_overrides_libraries_count++;
diff --git a/source/blender/blenloader/BLO_readfile.h
b/source/blender/blenloader/BLO_readfile.h
index c3a33115613..dbdb181281a 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -118,6 +118,7 @@ typedef struct BlendFileReadReport {
/* Number of libraries which had overrides that needed to be resynced, and a
single linked list
* of those. */
int resynced_lib_overrides_libraries_count;
+ bool do_resynced_lib_overrides_libraries_list;
struct LinkNode *resynced_lib_overrides_libraries;
} BlendFileReadReport;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
