diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 13:30:43 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 14:38:06 +0300 |
commit | 1b272a649b40e99dba4185167f6cee7cbece1942 (patch) | |
tree | 2785f52c566b36cbdcbf9355f698dc520ffbb482 /source/blender/blenkernel/intern/node.c | |
parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) |
Cleanup: Blenkernel, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/blenkernel` module.
No functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 91693abd1cf..174e1c12033 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1266,9 +1266,8 @@ bNode *nodeFindRootParent(bNode *node) if (node->parent) { return nodeFindRootParent(node->parent); } - else { - return node->type == NODE_FRAME ? node : NULL; - } + + return node->type == NODE_FRAME ? node : NULL; } /** @@ -1280,7 +1279,7 @@ bool nodeIsChildOf(const bNode *parent, const bNode *child) if (parent == child) { return true; } - else if (child->parent) { + if (child->parent) { return nodeIsChildOf(parent, child->parent); } return false; @@ -1339,9 +1338,8 @@ static void iter_backwards_ex(const bNodeTree *ntree, if (link->fromnode->iter_flag & recursion_mask) { continue; } - else { - link->fromnode->iter_flag |= recursion_mask; - } + + link->fromnode->iter_flag |= recursion_mask; if (!callback(link->fromnode, link->tonode, userdata)) { return; @@ -2582,9 +2580,8 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree) return ltree; } - else { - return NULL; - } + + return NULL; } /* sync local composite with real tree */ @@ -2989,9 +2986,8 @@ bNode *nodeGetActiveID(bNodeTree *ntree, short idtype) return node_get_active_id_recursive( ntree->active_viewer_key, NODE_INSTANCE_KEY_BASE, ntree, idtype); } - else { - return NULL; - } + + return NULL; } bool nodeSetActiveID(bNodeTree *ntree, short idtype, ID *id) @@ -3127,9 +3123,8 @@ int nodeSocketLinkLimit(struct bNodeSocket *sock) int limit = (sock->in_out == SOCK_IN) ? stype->input_link_limit : stype->output_link_limit; return limit; } - else { - return sock->limit; - } + + return sock->limit; } /* ************** Node Clipboard *********** */ @@ -3419,9 +3414,8 @@ bool BKE_node_instance_hash_tag_key(bNodeInstanceHash *hash, bNodeInstanceKey ke entry->tag = 1; return true; } - else { - return false; - } + + return false; } void BKE_node_instance_hash_remove_untagged(bNodeInstanceHash *hash, |