From 8851460174a5603a0e51e856b00dfa212b0162b2 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Wed, 7 Mar 2018 21:18:16 +0100 Subject: Proper fix for User Preferences window crash Reverts rBb9ae517794765d6a1660 and fixes the issue properly. Old fix could cause NULL to be passed to functions that expect all arguments to be non-NULL. --- source/blender/editors/scene/scene_edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/scene') diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 6298f03a6b0..da720272f67 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 = layer_old ? OBACT(layer_old) : NULL; + Object *obact_old = OBACT(layer_old); bool obact_new_mode_exists = ED_object_mode_generic_exists(bmain->wm.first, obact_new, workspace->object_mode); -- cgit v1.2.3