blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

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.
This commit is contained in:
Howard Trickey 2021-07-09 09:27:58 -04:00
parent 09082f6e85
commit 4c716ced09
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenlib/intern/mesh_boolean.cc
View File

@ -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(),