diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-07 08:40:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-07 08:40:02 +0300 |
| commit | b9ae517794765d6a16604de2803145e859bafb9d (patch) | |
| tree | e581712654a7223c80da06163ca007fb1532fe96 /source/blender/editors/scene/scene_edit.c | |
| parent | 49baf15a35e89dc9ef945d584a0842d908bd040a (diff) | |
Add missing NULL check
Caused loading user-prefs to crash.
Diffstat (limited to 'source/blender/editors/scene/scene_edit.c')
| -rw-r--r-- | source/blender/editors/scene/scene_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |