diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-06-01 14:54:07 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-06-01 14:54:07 +0300 |
| commit | db59a5f9f068a59cf7ad9e542d186ce245cb60e9 (patch) | |
| tree | 29d4884769bae03977dea5bc2c650612587b3605 /source/blender/modifiers | |
| parent | a25dbf243afc4ecfd5d027c43f53d047df5a3c02 (diff) | |
| parent | c078540512722e465e8cfc555dd958827b378a11 (diff) | |
Merge branch 'master' into temp-geometry-nodes-viewer-node
Diffstat (limited to 'source/blender/modifiers')
| -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, |