diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 21:19:05 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 21:19:05 +0300 |
| commit | 31705201dddebf7e3be5c4533b89f380aad1ede1 (patch) | |
| tree | 53c8be86b15e9ebd96dd60cad52e6acac8ce2324 /source/blender/blenkernel/intern/workspace.c | |
| parent | ea4c327c977223922c41c889fa2bd51403409dca (diff) | |
| parent | 337b6d075880ea44ff5183804a387dc98673ffb9 (diff) | |
Merge branch 'master' into active-fcurve-keyframe
Diffstat (limited to 'source/blender/blenkernel/intern/workspace.c')
| -rw-r--r-- | source/blender/blenkernel/intern/workspace.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index 4625fd76293..f653a190704 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -157,9 +157,8 @@ static void *workspace_relation_get_data_matching_parent(const ListBase *relatio if (relation != NULL) { return relation->value; } - else { - return NULL; - } + + return NULL; } /** @@ -397,10 +396,9 @@ bool BKE_workspace_owner_id_check(const WorkSpace *workspace, const char *owner_ if ((*owner_id == '\0') || ((workspace->flags & WORKSPACE_USE_FILTER_BY_ORIGIN) == 0)) { return true; } - else { - /* We could use hash lookup, for now this list is highly likely under < ~16 items. */ - return BLI_findstring(&workspace->owner_ids, owner_id, offsetof(wmOwnerID, name)) != NULL; - } + + /* We could use hash lookup, for now this list is highly likely under < ~16 items. */ + return BLI_findstring(&workspace->owner_ids, owner_id, offsetof(wmOwnerID, name)) != NULL; } void BKE_workspace_id_tag_all_visible(Main *bmain, int tag) |