[Bf-blender-cvs] [f2a24afe8c1] blender2.8: Fix T53647: Outliner crashes when active object is deleted

[Dalai Felinto]

Commit: f2a24afe8c1aa0221b378585e3c1901cc568a6d7
Author: Dalai Felinto
Date:   Fri Dec 29 09:55:13 2017 -0200
Branches: blender2.8
https://developer.blender.org/rBf2a24afe8c1aa0221b378585e3c1901cc568a6d7

Fix T53647: Outliner crashes when active object is deleted

Based on patch by Philipp Oeser (lichtwerk).

===================================================================

M	source/blender/editors/space_outliner/outliner_tree.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index a9c9ab74970..0d0714a3453 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1958,8 +1958,10 @@ void outliner_build_tree(Main *mainvar, Scene *scene, ViewLayer *view_layer, Spa
 		outliner_add_collections_master(soops, scene);
 	}
 	else {
-		ten = outliner_add_element(soops, &soops->tree, OBACT(view_layer), NULL, 0, 0);
-		ten->directdata = BASACT(view_layer);
+		if (BASACT(view_layer)) {
+			ten = outliner_add_element(soops, &soops->tree, OBACT(view_layer), NULL, 0, 0);
+			ten->directdata = BASACT(view_layer);
+		}
 	}
 
 	if ((soops->flag & SO_SKIP_SORT_ALPHA) == 0) {