diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 13:38:42 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 14:38:06 +0300 |
commit | 94eaaf097c3af408cdf84bb38aa295d01a84a741 (patch) | |
tree | 2ce58b897207e81924ef2d00e1a86d8d36b95cac /source/blender/depsgraph/intern/node | |
parent | f453ee7d3ab4be78f7bd0be5aa14d2a281552629 (diff) |
Cleanup: Depsgraph, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/depsgraph` module.
No functional changes.
Diffstat (limited to 'source/blender/depsgraph/intern/node')
-rw-r--r-- | source/blender/depsgraph/intern/node/deg_node.cc | 7 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/node/deg_node_component.cc | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node.cc b/source/blender/depsgraph/intern/node/deg_node.cc index 9e386f13888..b10e66336dc 100644 --- a/source/blender/depsgraph/intern/node/deg_node.cc +++ b/source/blender/depsgraph/intern/node/deg_node.cc @@ -317,12 +317,11 @@ NodeClass Node::get_class() const if (type == NodeType::OPERATION) { return NodeClass::OPERATION; } - else if (type < NodeType::PARAMETERS) { + if (type < NodeType::PARAMETERS) { return NodeClass::GENERIC; } - else { - return NodeClass::COMPONENT; - } + + return NodeClass::COMPONENT; } /******************************************************************************* diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc index cd82b7be050..2767513d6df 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.cc +++ b/source/blender/depsgraph/intern/node/deg_node_component.cc @@ -251,7 +251,7 @@ OperationNode *ComponentNode::get_entry_operation() if (entry_operation) { return entry_operation; } - else if (operations_map != nullptr && operations_map->size() == 1) { + if (operations_map != nullptr && operations_map->size() == 1) { OperationNode *op_node = nullptr; /* TODO(sergey): This is somewhat slow. */ for (OperationNode *tmp : operations_map->values()) { @@ -261,7 +261,7 @@ OperationNode *ComponentNode::get_entry_operation() entry_operation = op_node; return op_node; } - else if (operations.size() == 1) { + if (operations.size() == 1) { return operations[0]; } return nullptr; @@ -272,7 +272,7 @@ OperationNode *ComponentNode::get_exit_operation() if (exit_operation) { return exit_operation; } - else if (operations_map != nullptr && operations_map->size() == 1) { + if (operations_map != nullptr && operations_map->size() == 1) { OperationNode *op_node = nullptr; /* TODO(sergey): This is somewhat slow. */ for (OperationNode *tmp : operations_map->values()) { @@ -282,7 +282,7 @@ OperationNode *ComponentNode::get_exit_operation() exit_operation = op_node; return op_node; } - else if (operations.size() == 1) { + if (operations.size() == 1) { return operations[0]; } return nullptr; |