diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 15:51:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 15:55:15 +0300 |
commit | d8dbd49a2f23b7637f05fc058f39bdf6ab706624 (patch) | |
tree | 0805b9372c82ae6505d87e879824efe1d3e32f8e /source/blender/freestyle/intern/stroke/ChainingIterators.cpp | |
parent | 8987f7987d8160e1f6e79e8c85d6ce65b885ab25 (diff) |
Cleanup: style, use braces in source/
Automated using clang-tidy.
Diffstat (limited to 'source/blender/freestyle/intern/stroke/ChainingIterators.cpp')
-rw-r--r-- | source/blender/freestyle/intern/stroke/ChainingIterators.cpp | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp index 551b9aa4043..271db48aabe 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp @@ -40,20 +40,23 @@ bool AdjacencyIterator::isIncoming() const int AdjacencyIterator::increment() { ++_internalIterator; - while ((!_internalIterator.isEnd()) && (!isValid((*_internalIterator).first))) + while ((!_internalIterator.isEnd()) && (!isValid((*_internalIterator).first))) { ++_internalIterator; + } return 0; } bool AdjacencyIterator::isValid(ViewEdge *edge) { if (_restrictToSelection) { - if (edge->getTimeStamp() != TimeStamp::instance()->getTimeStamp()) + if (edge->getTimeStamp() != TimeStamp::instance()->getTimeStamp()) { return false; + } } if (_restrictToUnvisited) { - if (edge->getChainingTimeStamp() > TimeStamp::instance()->getTimeStamp()) + if (edge->getChainingTimeStamp() > TimeStamp::instance()->getTimeStamp()) { return false; + } } return true; } @@ -81,15 +84,19 @@ int ChainingIterator::increment() _edge = 0; return 0; } - if (traverse(it) < 0) + if (traverse(it) < 0) { return -1; + } _edge = result; - if (_edge == 0) + if (_edge == 0) { return 0; - if (_edge->A() == vertex) + } + if (_edge->A() == vertex) { _orientation = true; - else + } + else { _orientation = false; + } return 0; } @@ -106,15 +113,19 @@ int ChainingIterator::decrement() _edge = 0; return 0; } - if (traverse(it) < 0) + if (traverse(it) < 0) { return -1; + } _edge = result; - if (_edge == 0) + if (_edge == 0) { return 0; - if (_edge->B() == vertex) + } + if (_edge->B() == vertex) { _orientation = true; - else + } + else { _orientation = false; + } return 0; } @@ -186,17 +197,20 @@ int ChainSilhouetteIterator::traverse(const AdjacencyIterator &ait) int ChainPredicateIterator::traverse(const AdjacencyIterator &ait) { - if (!_unary_predicate || !_binary_predicate) + if (!_unary_predicate || !_binary_predicate) { return -1; + } AdjacencyIterator it(ait); // Iterates over next edges to see if one of them respects the predicate: while (!it.isEnd()) { ViewEdge *ve = *it; - if (_unary_predicate->operator()(*ve) < 0) + if (_unary_predicate->operator()(*ve) < 0) { return -1; + } if (_unary_predicate->result) { - if (_binary_predicate->operator()(*(getCurrentEdge()), *(ve)) < 0) + if (_binary_predicate->operator()(*(getCurrentEdge()), *(ve)) < 0) { return -1; + } if (_binary_predicate->result) { result = ve; return 0; |