From b9ae517794765d6a16604de2803145e859bafb9d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 7 Mar 2018 16:40:02 +1100 Subject: Add missing NULL check Caused loading user-prefs to crash. --- source/blender/editors/scene/scene_edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/scene/scene_edit.c') diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index da720272f67..6298f03a6b0 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -134,7 +134,7 @@ void ED_scene_change_update( CTX_data_eval_ctx(C, &eval_ctx_old); eObjectMode object_mode_old = workspace->object_mode; ViewLayer *layer_old = BKE_view_layer_from_workspace_get(scene_old, workspace); - Object *obact_old = OBACT(layer_old); + Object *obact_old = layer_old ? OBACT(layer_old) : NULL; bool obact_new_mode_exists = ED_object_mode_generic_exists(bmain->wm.first, obact_new, workspace->object_mode); -- cgit v1.2.3