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/view_map/ViewMapIterators.h | |
parent | 8987f7987d8160e1f6e79e8c85d6ce65b885ab25 (diff) |
Cleanup: style, use braces in source/
Automated using clang-tidy.
Diffstat (limited to 'source/blender/freestyle/intern/view_map/ViewMapIterators.h')
-rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMapIterators.h | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h index 0fb5438a153..174e25896cc 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h @@ -130,20 +130,24 @@ class orientedViewEdgeIterator : public Iterator { * not. */ virtual bool isBegin() const { - if (_Nature & Nature::T_VERTEX) + if (_Nature & Nature::T_VERTEX) { return (_tvertex_iter == _tbegin); - else + } + else { return (_nontvertex_iter == _begin); + } } /*! Tells whether the ViewEdge pointed by this iterator is after the last one of the iteration * list or not. */ virtual bool isEnd() const { - if (_Nature & Nature::T_VERTEX) + if (_Nature & Nature::T_VERTEX) { return (_tvertex_iter == _tend); - else + } + else { return (_nontvertex_iter == _end); + } } // operators @@ -168,10 +172,12 @@ class orientedViewEdgeIterator : public Iterator { /*! operator != */ virtual bool operator!=(const orientedViewEdgeIterator &b) const { - if (_Nature & Nature::T_VERTEX) + if (_Nature & Nature::T_VERTEX) { return (_tvertex_iter != b._tvertex_iter); - else + } + else { return (_nontvertex_iter != b._nontvertex_iter); + } } /*! operator == */ @@ -186,11 +192,13 @@ class orientedViewEdgeIterator : public Iterator { */ virtual ViewVertex::directedViewEdge &operator*() const { - if (_Nature & Nature::T_VERTEX) + if (_Nature & Nature::T_VERTEX) { // return _tvertex_iter; return **_tvertex_iter; - else + } + else { return (*_nontvertex_iter); + } } /*! Returns a pointer to the pointed orientedViewEdge. * Can't be called in the scripting language. @@ -210,8 +218,9 @@ class orientedViewEdgeIterator : public Iterator { if (_tvertex_iter != _tend) { // FIXME : pquoi deja ? ViewVertex::directedViewEdge tmp2 = (**_tvertex_iter); - if (tmp2.first == tmp.first) + if (tmp2.first == tmp.first) { ++_tvertex_iter; + } } } else { @@ -379,8 +388,9 @@ class SVertexIterator : public Interface0DIteratorNested { virtual bool operator==(const Interface0DIteratorNested &it) const { const SVertexIterator *it_exact = dynamic_cast<const SVertexIterator *>(&it); - if (!it_exact) + if (!it_exact) { return false; + } return (_vertex == it_exact->_vertex); } |