From aa3a4973a30ff668a62447e18ac41f6c916b4a8b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Nov 2020 12:30:59 +1100 Subject: Cleanup: use ELEM macro --- .../blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp | 2 +- source/blender/freestyle/intern/geometry/matrix_util.cpp | 2 +- source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp | 2 +- source/blender/freestyle/intern/stroke/Operators.cpp | 4 ++-- source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp | 4 ++-- source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp | 4 ++-- source/blender/freestyle/intern/view_map/ViewMap.cpp | 2 +- source/blender/freestyle/intern/winged_edge/WXEdge.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 741c7d6ea41..291a38d23df 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -169,7 +169,7 @@ int BlenderFileLoader::countClippedFaces(float v1[3], float v2[3], float v3[3], } break; case 3: - if (sum == 3 || sum == -3) { + if (ELEM(sum, 3, -3)) { numTris = 0; } else { diff --git a/source/blender/freestyle/intern/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp index 9d25a240a63..637c2d05574 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.cpp +++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp @@ -149,7 +149,7 @@ void semi_definite_symmetric_eigen(const double *mat, int n, double *eigen_vec, imv = n * (m - 1); for (i = 1; i <= n; i++) { - if ((i != l) && (i != m)) { + if (!ELEM(i, l, m)) { iq = (i * i - i) / 2; if (i < m) { diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index e04a89bad3b..d337bf7f90e 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -106,7 +106,7 @@ static PyObject *FEdge_sq_item(BPy_FEdge *self, int keynum) if (keynum < 0) { keynum += FEdge_sq_length(self); } - if (keynum == 0 || keynum == 1) { + if (ELEM(keynum, 0, 1)) { SVertex *v = self->fe->operator[](keynum); if (v) { return BPy_SVertex_from_SVertex(*v); diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 05dbbb1304e..307122833e4 100644 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -656,7 +656,7 @@ int Operators::sequentialSplit(UnaryPredicate0D &startingPred, goto error; } } while (!startingPred.result); - } while ((itStart != end) && (itStart != last)); + } while (!ELEM(itStart, end, last)); } // Update the current set of chains: @@ -1122,7 +1122,7 @@ static Stroke *createStroke(Interface1D &inter) stroke->push_back(stroke_vertex); previous = current; ++it; - } while ((it != itend) && (it != itfirst)); + } while (!ELEM(it, itend, itfirst)); if (it == itfirst) { // Add last vertex: diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp index cb3a297076a..b53771ad2c2 100644 --- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp +++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp @@ -191,7 +191,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe // Either we have run out of FEdges, or we already have the one edge we need to determine // visibility Cull all remaining edges. - while (fe != NULL && fe != festart) { + while (!ELEM(fe, NULL, festart)) { fe->setIsInImage(false); fe = fe->nextEdge(); } @@ -253,7 +253,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe expandGridSpaceOccluderProscenium(fe); } fe = fe->nextEdge(); - } while (fe != NULL && fe != festart); + } while (!ELEM(fe, NULL, festart)); } } diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp index aecd37fa0de..8866ec2e267 100644 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp @@ -315,7 +315,7 @@ OWXFaceLayer ViewEdgeXBuilder::FindNextFaceLayer(const OWXFaceLayer &iFaceLayer) tend = iFaceLayer.fl->getSmoothEdge()->ta(); } // special case of EDGE_VERTEX config: - if ((tend == 0.0) || (tend == 1.0)) { + if (ELEM(tend, 0.0, 1.0)) { WVertex *nextVertex; if (tend == 0.0) { nextVertex = woeend->GetaVertex(); @@ -397,7 +397,7 @@ OWXFaceLayer ViewEdgeXBuilder::FindPreviousFaceLayer(const OWXFaceLayer &iFaceLa } // special case of EDGE_VERTEX config: - if ((tend == 0.0) || (tend == 1.0)) { + if (ELEM(tend, 0.0, 1.0)) { WVertex *previousVertex; if (tend == 0.0) { previousVertex = woebegin->GetaVertex(); diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp index fa2f95dac72..b4faee7946b 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp @@ -836,7 +836,7 @@ void ViewEdge::UpdateFEdges() do { currentEdge->setViewEdge(this); currentEdge = currentEdge->nextEdge(); - } while ((currentEdge != NULL) && (currentEdge != _FEdgeB)); + } while (!ELEM(currentEdge, NULL, _FEdgeB)); // last one _FEdgeB->setViewEdge(this); } diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp index f11f30130c8..57eca876913 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp @@ -119,7 +119,7 @@ WXSmoothEdge *WXFaceLayer::BuildSmoothEdge() else if (_nNullDotP == 1) { // that means that we have exactly one of the 2 extremities of our silhouette edge is a vertex // of the mesh - if ((_nPosDotP == 2) || (_nPosDotP == 0)) { + if (ELEM(_nPosDotP, 2, 0)) { _pSmoothEdge = NULL; return _pSmoothEdge; } -- cgit v1.2.3