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:
authorSybren A. Stüvel <sybren@blender.org>2020-08-07 13:39:05 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-08-07 14:38:06 +0300
commit326e137a8cfaac6587a83d4c61d2889832926827 (patch)
tree07f7e924eec6372fe9e9b24481f420b20777fa13 /source/blender/freestyle/intern/stroke
parent94eaaf097c3af408cdf84bb38aa295d01a84a741 (diff)
Cleanup: Freestyle, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return` rule in the `source/blender/freestyle` module. No functional changes.
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
-rw-r--r--source/blender/freestyle/intern/stroke/Curve.cpp6
-rw-r--r--source/blender/freestyle/intern/stroke/StrokeRenderer.cpp5
2 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp
index 02a1d32953d..51c40c890a3 100644
--- a/source/blender/freestyle/intern/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
@@ -216,10 +216,10 @@ FEdge *CurvePoint::getFEdge(Interface0D &inter)
if (iVertexB->__B == 0) {
return __A->getFEdge(*(iVertexB->__A));
}
- else if (iVertexB->__A == __A) {
+ if (iVertexB->__A == __A) {
return __A->getFEdge(*(iVertexB->__B));
}
- else if (iVertexB->__B == __A) {
+ if (iVertexB->__B == __A) {
return __A->getFEdge(*(iVertexB->__A));
}
}
@@ -227,7 +227,7 @@ FEdge *CurvePoint::getFEdge(Interface0D &inter)
if (iVertexB->__A == __A) {
return __B->getFEdge(*(iVertexB->__A));
}
- else if (iVertexB->__A == __B) {
+ if (iVertexB->__A == __B) {
return __A->getFEdge(*(iVertexB->__A));
}
}
diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
index a76579c7c96..a29d015b4c9 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
@@ -101,9 +101,8 @@ unsigned TextureManager::getBrushTextureIndex(string name, Stroke::MediumType lo
cerr << "brush file " << name << " not found" << endl;
return 0;
}
- else {
- return _brushesMap[bt];
- }
+
+ return _brushesMap[bt];
}
void TextureManager::Options::setPatternsPath(const string &path)