Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/freestyle/intern/stroke/ChainingIterators.cpp')
-rw-r--r--source/blender/freestyle/intern/stroke/ChainingIterators.cpp42
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;