diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 13:40:49 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 14:38:06 +0300 |
commit | 44b7354742ef3728f212edac1277c0d25fa59934 (patch) | |
tree | 7f02237f069b756ae40aec8ab7479d62da8dbb61 /source/blender/nodes/intern | |
parent | 47f8c444a4d05950d6544f6d09471f808e64b4ab (diff) |
Cleanup: Nodes, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/nodes` module.
No functional changes.
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r-- | source/blender/nodes/intern/node_common.c | 10 | ||||
-rw-r--r-- | source/blender/nodes/intern/node_tree_multi_function.cc | 11 |
2 files changed, 9 insertions, 12 deletions
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index 439e41b963b..aa1f23163a0 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -84,13 +84,11 @@ bool node_group_poll_instance(bNode *node, bNodeTree *nodetree) if (grouptree) { return nodeGroupPoll(nodetree, grouptree); } - else { - return true; /* without a linked node tree, group node is always ok */ - } - } - else { - return false; + + return true; /* without a linked node tree, group node is always ok */ } + + return false; } int nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree) diff --git a/source/blender/nodes/intern/node_tree_multi_function.cc b/source/blender/nodes/intern/node_tree_multi_function.cc index 82842c4ef32..09a80fd23f4 100644 --- a/source/blender/nodes/intern/node_tree_multi_function.cc +++ b/source/blender/nodes/intern/node_tree_multi_function.cc @@ -176,13 +176,12 @@ static fn::MFOutputSocket *try_find_origin(CommonMFNetworkBuilderData &common, } return nullptr; } - else { - const DGroupInput &from_group_input = *from_group_inputs[0]; - if (is_multi_function_data_socket(from_group_input.bsocket())) { - return &common.network_map.lookup(from_group_input); - } - return nullptr; + + const DGroupInput &from_group_input = *from_group_inputs[0]; + if (is_multi_function_data_socket(from_group_input.bsocket())) { + return &common.network_map.lookup(from_group_input); } + return nullptr; } using ImplicitConversionsMap = |