Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPratik Borhade <pratikborhade302@gmail.com>2022-10-04 18:19:34 +0300
committerPratik Borhade <pratikborhade302@gmail.com>2022-10-04 18:19:34 +0300
commit4186b0ebe4e86eb4de5e88dd333ea3884748173c (patch)
treed7a22ec6f55f61e1430f42a86c8348b464a26988 /source/blender/editors/space_outliner
parentdd4a40f42d7b3c7aec86c5a07ce6ae71f006f7d3 (diff)
Fix T101233: Crash on deleting the object in outliner due to null pointer access
After rB188f7585a183 deleting the object results in crash due to null pointer access if collections are filtered out Reviewed by: mont29 Differential Revision: https://developer.blender.org/D16031
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r--source/blender/editors/space_outliner/outliner_tools.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc
index 16b24b14845..6679489af60 100644
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -2371,7 +2371,7 @@ static TreeTraversalAction outliner_collect_objects_to_delete(TreeElement *te, v
/* Do not allow to delete children objects of an override collection. */
TreeElement *te_parent = te->parent;
- if (outliner_is_collection_tree_element(te_parent)) {
+ if (te_parent != nullptr && outliner_is_collection_tree_element(te_parent)) {
TreeStoreElem *tselem_parent = TREESTORE(te_parent);
ID *id_parent = tselem_parent->id;
BLI_assert(GS(id_parent->name) == ID_GR);