diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2020-08-22 15:19:10 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2020-08-22 15:19:10 +0300 |
| commit | 2231c4bd89238c7315d858d4027a4e42a1a4e364 (patch) | |
| tree | 910764ca94319fdde64ede839eb5e3679f9db0f2 /source/blender/blenlib | |
| parent | 7e06208f6a3b743e323246fb02ed47371d054097 (diff) | |
Fix clang-tidy warnings.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/math_vec.cc | 14 | ||||
| -rw-r--r-- | source/blender/blenlib/tests/BLI_mesh_intersect_test.cc | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/blenlib/intern/math_vec.cc b/source/blender/blenlib/intern/math_vec.cc index 7d81908e298..501b26da862 100644 --- a/source/blender/blenlib/intern/math_vec.cc +++ b/source/blender/blenlib/intern/math_vec.cc @@ -875,17 +875,13 @@ double orient2d(const double *pa, const double *pb, const double *pc) if (detright <= 0.0) { return det; } - else { - detsum = detleft + detright; - } + detsum = detleft + detright; } else if (detleft < 0.0) { if (detright >= 0.0) { return det; } - else { - detsum = -detleft - detright; - } + detsum = -detleft - detright; } else { return det; @@ -940,6 +936,9 @@ double orient3dfast(const double *pa, const double *pb, const double *pc, const cdx * (ady * bdz - adz * bdy); } +/* Note: since this code comes from an external source, prefer not to break it + * up to fix this clang-tidy warning. + * NOLINTNEXTLINE: readability-function-size */ static double orient3dadapt( const double *pa, const double *pb, const double *pc, const double *pd, double permanent) { @@ -1448,6 +1447,9 @@ double incirclefast(const double *pa, const double *pb, const double *pc, const return alift * bcdet + blift * cadet + clift * abdet; } +/* Note: since this code comes from an external source, prefer not to break it + * up to fix this clang-tidy warning. + * NOLINTNEXTLINE: readability-function-size */ static double incircleadapt( const double *pa, const double *pb, const double *pc, const double *pd, double permanent) { diff --git a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc index d4eebe84067..f03bab14ffb 100644 --- a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc +++ b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc @@ -16,7 +16,7 @@ #include "BLI_vector.hh" #define DO_REGULAR_TESTS 1 -#define DO_PERF_TESTS 1 +#define DO_PERF_TESTS 0 namespace blender::meshintersect::tests { |