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:
authorHoward Trickey <howard.trickey@gmail.com>2021-07-09 16:27:58 +0300
committerHoward Trickey <howard.trickey@gmail.com>2021-07-09 16:29:33 +0300
commit4c716ced09efc90da7014094f83d2705cc0a9b32 (patch)
tree0a808838ebf79912996c6944bdc0db4590f34ce9
parent09082f6e85d2845afa3d51338ca22cca6f4d5ab4 (diff)
Fix a compiler warning on Windows for Exact Boolean.
For some reason, the Windows compiler didn't like the static function being used in the parallel_reduece.
-rw-r--r--source/blender/blenlib/intern/mesh_boolean.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc
index dddf8851767..8b8850c7cdb 100644
--- a/source/blender/blenlib/intern/mesh_boolean.cc
+++ b/source/blender/blenlib/intern/mesh_boolean.cc
@@ -1460,11 +1460,6 @@ static int find_cell_for_point_near_edge(mpq3 p,
return c;
}
-static const Vert *max_x_vert(const Vert *a, const Vert *b)
-{
- return (a->co_exact.x > b->co_exact.x) ? a : b;
-}
-
/**
* Find the ambient cell -- that is, the cell that is outside
* all other cells.
@@ -1492,7 +1487,9 @@ static int find_ambient_cell(const IMesh &tm,
/* First find a vertex with the maximum x value. */
/* Prefer not to populate the verts in the #IMesh just for this. */
const Vert *v_extreme;
-
+ auto max_x_vert = [](const Vert *a, const Vert *b) {
+ return (a->co_exact.x > b->co_exact.x) ? a : b;
+ };
if (component_patches == nullptr) {
v_extreme = threading::parallel_reduce(
tm.face_index_range(),