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
committerThomas Dinges <blender@dingto.org>2022-10-04 21:21:56 +0300
commit28e09980a2d09eaea3f49cb080265014a4f1c2f4 (patch)
treec00aaacf2800663a274ace98de0edcc382bf09f5
parent5a1ef2dc786f5b7529ed9d1d82628ba5e5b87413 (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
-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 847b9e0963b..dfb421367c1 100644
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -2351,7 +2351,7 @@ static TreeTraversalAction outliner_find_objects_to_delete(TreeElement *te, void
/* 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);