[Bf-blender-cvs] [19363880a67] master: New boolean: silence an "unused" warning.
Howard Trickey
noreply at git.blender.org
Sun Aug 30 20:13:47 CEST 2020
Commit: 19363880a6770852a8f94565c162a987850d58e3
Author: Howard Trickey
Date: Sun Aug 30 14:10:05 2020 -0400
Branches: master
https://developer.blender.org/rB19363880a6770852a8f94565c162a987850d58e3
New boolean: silence an "unused" warning.
Previous commit stopped using some functions. Since I may need
them again for future performance tuning, these are just ifdef'd out
for now.
===================================================================
M source/blender/blenlib/intern/mesh_intersect.cc
===================================================================
diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc
index f70f10ac708..5bd25404674 100644
--- a/source/blender/blenlib/intern/mesh_intersect.cc
+++ b/source/blender/blenlib/intern/mesh_intersect.cc
@@ -1397,6 +1397,11 @@ static double supremum_dot_cross(const double3 &a, const double3 &b)
return double3::dot(c, c);
}
+/* The index of dot when inputs are plane_coords with index 1 is much higher.
+ * Plane coords have index 6.
+ */
+constexpr int index_dot_plane_coords = 15;
+
/**
* Used with supremum to get error bound. See Burnikel et al paper.
* index_plane_coord is the index of a plane coordinate calculated
@@ -1409,6 +1414,8 @@ static double supremum_dot_cross(const double3 &a, const double3 &b)
*/
constexpr int index_dot_cross = 11;
+/* Not using this at the moment. Leaving it for a bit in case we want it again. */
+# if 0
static double supremum_dot(const double3 &a, const double3 &b)
{
double3 abs_a = double3::abs(a);
@@ -1416,12 +1423,6 @@ static double supremum_dot(const double3 &a, const double3 &b)
return double3::dot(abs_a, abs_b);
}
-/* Actually index_dot = 3 + 2 * (max index of input coordinates). */
-/* The index of dot when inputs are plane_coords with index 1 is much higher.
- * Plane coords have index 6.
- */
-constexpr int index_dot_plane_coords = 15;
-
static double supremum_orient3d(const double3 &a,
const double3 &b,
const double3 &c,
@@ -1524,6 +1525,7 @@ static bool dot_must_be_positive(const double3 &a, const double3 &b)
}
return false;
}
+# endif
/**
* Return the approximate side of point p on a plane with normal plane_no and point plane_p.
@@ -1554,6 +1556,8 @@ static int filter_plane_side(const double3 &p,
return 0;
}
+/* Not using this at the moment. Leave it here for a while in case we want it again. */
+# if 0
/**
* A fast, non-exhaustive test for non_trivial intersection.
* If this returns false then we are sure that tri1 and tri2
@@ -1627,6 +1631,7 @@ static bool may_non_trivially_intersect(Face *t1, Face *t2)
/* We weren't able to prove that any intersection is trivial. */
return true;
}
+# endif
/*
* interesect_tri_tri and helper functions.
More information about the Bf-blender-cvs
mailing list