From 805cabdf177af6c71da6239ff3fc5d2524286a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 9 Jul 2019 11:51:56 +0200 Subject: Fix T64483: crash when hovering over outliner after closing render window The `tselem->id` pointer can also be used for non-ID data (according to this comment in DNA_outliner_types.h: ``` /* XXX We actually also store non-ID data in this pointer for identifying * the TreeStoreElem for a TreeElement when rebuilding the tree. Ugly! */ ``` As such, I don't mind adding a `NULL`-check in the `is_object_data_in_editmode()` function. After all, when there is no object, its data certainly is not in edit mode. --- source/blender/editors/space_outliner/outliner_draw.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 7451c8672f4..31783e09aeb 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -116,6 +116,10 @@ static void outliner_tree_dimensions(SpaceOutliner *soops, int *r_width, int *r_ */ static bool is_object_data_in_editmode(const ID *id, const Object *obact) { + if (id == NULL) { + return false; + } + const short id_type = GS(id->name); if (id_type == ID_GD && obact && obact->data == id) { -- cgit v1.2.3