Commit: a6664383c6ef21ecaf03f0867ccef76732e12bf3
Author: Bastien Montagne
Date: Wed Mar 24 16:35:48 2021 +0100
Branches: master
https://developer.blender.org/rBa6664383c6ef21ecaf03f0867ccef76732e12bf3
Fix (unreported) Outliner: missing override tree items for collections in
Viewlayer view.
Probably lost at some point in recent refactor moving the whole tree
building towards a more modular, C++ code.
===================================================================
M source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
===================================================================
diff --git
a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
index 89c9960a24f..f00cf3c34c0 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
@@ -148,6 +148,14 @@ void
TreeDisplayViewLayer::add_layer_collections_recursive(ListBase &tree,
if (!exclude && show_objects_) {
add_layer_collection_objects(ten->subtree, *lc, *ten);
}
+
+ const bool lib_overrides_visible =
!SUPPORT_FILTER_OUTLINER(&space_outliner_) ||
+ ((space_outliner_.filter &
SO_FILTER_NO_LIB_OVERRIDE) == 0);
+
+ if (lib_overrides_visible &&
ID_IS_OVERRIDE_LIBRARY_REAL(&lc->collection->id)) {
+ outliner_add_element(
+ &space_outliner_, &ten->subtree, &lc->collection->id, ten,
TSE_LIBRARY_OVERRIDE_BASE, 0);
+ }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
