blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Cleanup: Remove uneeded NULL checks on ed_screen_context 

view_layer should never be NULL.
This commit is contained in:
Dalai Felinto 2020-05-26 15:08:45 +02:00
parent 299682bde7
commit 14b1c55e11
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/screen/screen_context.c
View File

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