blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Cleanup: 3D View context, early returns for clearer flow 

Refactor `view3d_context()` to use early `return`s instead of a bundle of
`if`/`else if`/`else`, some of which had `return`s and some not.

No functional changes.
This commit is contained in:
Sybren A. Stüvel 2021-10-26 17:22:11 +02:00
parent 5acbc01d0d
commit 2d5c9e0baf
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_view3d/space_view3d.c
View File

@ -1700,8 +1700,9 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
if (CTX_data_dir(member)) {
CTX_data_dir_set(result, view3d_context_dir);
return CTX_RESULT_OK;
}
else if (CTX_data_equals(member, "active_object")) {
if (CTX_data_equals(member, "active_object")) {
/* In most cases the active object is the `view_layer->basact->object`.
* For the 3D view however it can be NULL when hidden.
*
@ -1727,11 +1728,8 @@ static int view3d_context(const bContext *C, const char *member, bContextDataRes
return CTX_RESULT_OK;
}
else {
return CTX_RESULT_MEMBER_NOT_FOUND;
}
return CTX_RESULT_OK;
return CTX_RESULT_MEMBER_NOT_FOUND;
}
static void view3d_id_remap(ScrArea *area, SpaceLink *slink, ID *old_id, ID *new_id)