diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-05-26 16:08:45 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-05-26 16:08:45 +0300 |
| commit | 14b1c55e110123046f3fc98d1d5458a8ab2225c7 (patch) | |
| tree | b30d342135f654e9ed17e9755413f29f3d48cb2f /source/blender/editors/screen/screen_context.c | |
| parent | 299682bde72d58b6995b645859983481a8895826 (diff) | |
Cleanup: Remove uneeded NULL checks on ed_screen_context
view_layer should never be NULL.
Diffstat (limited to 'source/blender/editors/screen/screen_context.c')
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index b383930ddda..3202dc68f37 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -118,8 +118,8 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult ScrArea *area = CTX_wm_area(C); Scene *scene = WM_window_get_active_scene(win); ViewLayer *view_layer = WM_window_get_active_view_layer(win); - Object *obact = (view_layer && view_layer->basact) ? view_layer->basact->object : NULL; - Object *obedit = view_layer ? OBEDIT_FROM_VIEW_LAYER(view_layer) : NULL; + Object *obact = view_layer->basact ? view_layer->basact->object : NULL; + Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); if (CTX_data_dir(member)) { CTX_data_dir_set(result, screen_context_dir); |