diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-06-01 05:49:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-06-01 06:25:00 +0300 |
| commit | 5e7fb77dc4d27df74a8e839b8a4eb7a1fe43475b (patch) | |
| tree | 30492193b0670f378ec892202082d12b9298860b /source/blender/modifiers/intern/MOD_boolean.cc | |
| parent | f8ce744c83500b86dad4d5a62a0b733bf9fd4b59 (diff) | |
BMesh: remove checks for tessellating 2 sided faces
2 sided faces aren't supported and will cause problems in many areas
of Blender's code.
Removing (implied) support for faces with fewer than 3 sides
means the total number of triangles is known ahead of time.
This simplifies adding support for multi-threading and partial updates
to an existing tessellation - as the face and loop indices can be used
to access the range of triangles associated with a face.
Also correct outdated comments.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.cc')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index 9b8782737c3..4b9b24e4e47 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -283,11 +283,10 @@ static void BMD_mesh_intersection(BMesh *bm, /* main bmesh intersection setup */ /* create tessface & intersect */ const int looptris_tot = poly_to_tri_count(bm->totface, bm->totloop); - int tottri; BMLoop *(*looptris)[3] = (BMLoop * (*)[3]) MEM_malloc_arrayN(looptris_tot, sizeof(*looptris), __func__); - BM_mesh_calc_tessellation_beauty(bm, looptris, &tottri); + BM_mesh_calc_tessellation_beauty(bm, looptris); /* postpone this until after tessellating * so we can use the original normals before the vertex are moved */ @@ -364,7 +363,7 @@ static void BMD_mesh_intersection(BMesh *bm, BM_mesh_intersect(bm, looptris, - tottri, + looptris_tot, bm_face_isect_pair, nullptr, false, |