[Bf-blender-cvs] [14b1c55e110] master: Cleanup: Remove uneeded NULL checks on ed_screen_context

[Dalai Felinto]

Commit: 14b1c55e110123046f3fc98d1d5458a8ab2225c7
Author: Dalai Felinto
Date:   Tue May 26 15:08:45 2020 +0200
Branches: master
https://developer.blender.org/rB14b1c55e110123046f3fc98d1d5458a8ab2225c7

Cleanup: Remove uneeded NULL checks on ed_screen_context

view_layer should never be NULL.

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

M	source/blender/editors/screen/screen_context.c

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

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);