diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-25 15:41:22 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-25 15:41:22 +0300 |
commit | 0419ee871ff960f62e28a2a9fed764f66c616d71 (patch) | |
tree | 4a114edf1d1af726575297e79e0c7f15a806000a /source/blender/freestyle | |
parent | 21d77a417e17ac92bfc10dbd742c867d4019ce69 (diff) |
Cleanup: remove redundant parenthesis (especially with macros)
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r-- | source/blender/freestyle/intern/stroke/Stroke.cpp | 4 | ||||
-rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index 7aacf61c604..66a31d02a9b 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -593,14 +593,14 @@ int Stroke::Resample(int iNPoints) for (vector<StrokeSegment>::iterator s = strokeSegments.begin(), send = strokeSegments.end(); s != send; ++s) { - newVertices.push_back(&(*(s->_begin))); + newVertices.push_back(&*(s->_begin)); if (s->_sampling < _sampling) { _sampling = s->_sampling; } t = s->_sampling / s->_length; for (int i = 0; i < s->_n; ++i) { - newVertex = new StrokeVertex(&(*(s->_begin)), &(*(s->_end)), t); + newVertex = new StrokeVertex(&*(s->_begin), &*(s->_end), t); newVertices.push_back(newVertex); t += s->_sampling / s->_length; } diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index 343f6a8f761..d73d457713c 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -1289,7 +1289,7 @@ void ViewMapBuilder::computeCusps(ViewMap *ioViewMap) if (_pRenderMonitor && _pRenderMonitor->testBreak()) { break; } - if ((!((*ve)->getNature() & Nature::SILHOUETTE)) || (!((*ve)->fedgeA()->isSmooth()))) { + if (!((*ve)->getNature() & Nature::SILHOUETTE) || !((*ve)->fedgeA()->isSmooth())) { continue; } FEdge *fe = (*ve)->fedgeA(); @@ -2313,8 +2313,8 @@ struct silhouette_binary_rule : public binary_rule<segment, segment> { FEdge *f1 = s1.edge(); FEdge *f2 = s2.edge(); - if ((!(((f1)->getNature() & Nature::SILHOUETTE) || ((f1)->getNature() & Nature::BORDER))) && - (!(((f2)->getNature() & Nature::SILHOUETTE) || ((f2)->getNature() & Nature::BORDER)))) { + if (!(((f1)->getNature() & Nature::SILHOUETTE) || ((f1)->getNature() & Nature::BORDER)) && + !(((f2)->getNature() & Nature::SILHOUETTE) || ((f2)->getNature() & Nature::BORDER))) { return false; } |