griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #139887: Outliner crash after excluding collection

Browse Source 
Caused by 6fe4496f4c
This is due to missing null check

Pull Request: https://projects.blender.org/blender/blender/pulls/140024
This commit is contained in:
Pratik Borhade
2025-06-11 11:38:53 +02:00
committed by Pratik Borhade
parent 8bb6f8062f
commit 39a138aa92
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
View File

@@ -253,9 +253,9 @@ void ObjectsChildrenBuilder::make_object_parent_hierarchy_collections()
Vector<TreeElement *> *parent_ob_tree_elements = object_tree_elements_map_.lookup_ptr(
ob->parent);
Vector<TreeElement *> &child_ob_tree_elements = *object_tree_elements_map_.lookup_ptr(ob);
Vector<TreeElement *> *child_ob_tree_elements = object_tree_elements_map_.lookup_ptr(ob);
if (parent_ob_tree_elements == nullptr) {
if (!parent_ob_tree_elements || !child_ob_tree_elements) {
continue;
}
@@ -273,7 +273,7 @@ void ObjectsChildrenBuilder::make_object_parent_hierarchy_collections()
parent_ob_collection_tree_element = parent_ob_collection_tree_element->parent;
}
for (TreeElement *child_ob_tree_element : child_ob_tree_elements) {
for (TreeElement *child_ob_tree_element : *child_ob_tree_elements) {
if (child_ob_tree_element->parent == parent_ob_collection_tree_element) {
/* Move from the collection subtree into the parent object subtree. */
BLI_remlink(&parent_ob_collection_tree_element->subtree, child_ob_tree_element);
@@ -297,7 +297,7 @@ void ObjectsChildrenBuilder::make_object_parent_hierarchy_collections()
0,
false);
child_ob_tree_element->flag |= TE_CHILD_NOT_IN_COLLECTION;
child_ob_tree_elements.append(child_ob_tree_element);
child_ob_tree_elements->append(child_ob_tree_element);
}
}
}