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:
authorCampbell Barton <ideasman42@gmail.com>2020-08-08 04:02:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-08-08 06:37:55 +0300
commit586a3084677b03e314a906ffdac3560a24058409 (patch)
treeb2b920b14e5408b09556c514814e82a188a1d38d /source/blender/freestyle/intern/geometry
parentf1b1a0745f53564ed8eedd90d2de41cdf1d72836 (diff)
Cleanup: remove redundant return parenthesis
Diffstat (limited to 'source/blender/freestyle/intern/geometry')
-rw-r--r--source/blender/freestyle/intern/geometry/FitCurve.cpp4
-rw-r--r--source/blender/freestyle/intern/geometry/GeomUtils.cpp20
2 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index b60de93c4a1..aeb4902e5b0 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -202,7 +202,7 @@ static BezierCurve GenerateBezier(
bezCurve[3] = d[last];
V2Add(&bezCurve[0], V2Scale(&tHat1, alpha_l), &bezCurve[1]);
V2Add(&bezCurve[3], V2Scale(&tHat2, alpha_r), &bezCurve[2]);
- return (bezCurve);
+ return bezCurve;
}
/*
@@ -223,7 +223,7 @@ static double *Reparameterize(Vector2 *d, int first, int last, double *u, Bezier
for (i = first; i <= last; i++) {
uPrime[i - first] = NewtonRaphsonRootFind(bezCurve, d[i], u[i - first]);
}
- return (uPrime);
+ return uPrime;
}
/*
diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp
index dbd792852ad..89a89d095ea 100644
--- a/source/blender/freestyle/intern/geometry/GeomUtils.cpp
+++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp
@@ -77,7 +77,7 @@ intersection_test intersect2dSeg2dSeg(
// Check signs of r3 and r4. If both point 3 and point 4 lie on same side of line 1,
// the line segments do not intersect.
if (r3 != 0 && r4 != 0 && r3 * r4 > 0.0) {
- return (DONT_INTERSECT);
+ return DONT_INTERSECT;
}
// Compute a2, b2, c2
@@ -92,13 +92,13 @@ intersection_test intersect2dSeg2dSeg(
// Check signs of r1 and r2. If both point 1 and point 2 lie on same side of second line
// segment, the line segments do not intersect.
if (r1 != 0 && r2 != 0 && r1 * r2 > 0.0) {
- return (DONT_INTERSECT);
+ return DONT_INTERSECT;
}
// Line segments intersect: compute intersection point.
denom = a1 * b2 - a2 * b1;
if (fabs(denom) < M_EPSILON) {
- return (COLINEAR);
+ return COLINEAR;
}
num = b1 * c2 - b2 * c1;
@@ -107,7 +107,7 @@ intersection_test intersect2dSeg2dSeg(
num = a2 * c1 - a1 * c2;
res[1] = num / denom;
- return (DO_INTERSECT);
+ return DO_INTERSECT;
}
intersection_test intersect2dLine2dLine(
@@ -129,7 +129,7 @@ intersection_test intersect2dLine2dLine(
// Line segments intersect: compute intersection point.
denom = a1 * b2 - a2 * b1;
if (fabs(denom) < M_EPSILON) {
- return (COLINEAR);
+ return COLINEAR;
}
num = b1 * c2 - b2 * c1;
@@ -138,7 +138,7 @@ intersection_test intersect2dLine2dLine(
num = a2 * c1 - a1 * c2;
res[1] = num / denom;
- return (DO_INTERSECT);
+ return DO_INTERSECT;
}
intersection_test intersect2dSeg2dSegParametric(const Vec2r &p1,
@@ -165,7 +165,7 @@ intersection_test intersect2dSeg2dSegParametric(const Vec2r &p1,
// Check signs of r3 and r4. If both point 3 and point 4 lie on same side of line 1,
// the line segments do not intersect.
if (r3 != 0 && r4 != 0 && r3 * r4 > 0.0) {
- return (DONT_INTERSECT);
+ return DONT_INTERSECT;
}
// Compute a2, b2, c2
@@ -180,13 +180,13 @@ intersection_test intersect2dSeg2dSegParametric(const Vec2r &p1,
// Check signs of r1 and r2. If both point 1 and point 2 lie on same side of second line
// segment, the line segments do not intersect.
if (r1 != 0 && r2 != 0 && r1 * r2 > 0.0) {
- return (DONT_INTERSECT);
+ return DONT_INTERSECT;
}
// Line segments intersect: compute intersection point.
denom = a1 * b2 - a2 * b1;
if (fabs(denom) < epsilon) {
- return (COLINEAR);
+ return COLINEAR;
}
real d1, e1;
@@ -200,7 +200,7 @@ intersection_test intersect2dSeg2dSegParametric(const Vec2r &p1,
num = -b1 * d1 - a1 * e1;
u = num / denom;
- return (DO_INTERSECT);
+ return DO_INTERSECT;
}
// AABB-triangle overlap test code by Tomas Akenine-Möller