archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Modifiers: add minimum number of vertices to triangulate modifier.

Browse Source 
This lets you only triangulate n-gons when setting the number to 5 or more.

Differential Revision: https://developer.blender.org/D4367
This commit is contained in:
Ish Bosamiya
2019-03-22 17:55:51 +01:00
committed by Brecht Van Lommel
parent c89dcc89e6
commit da5b6ed75b
10 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/modifiers/intern/MOD_triangulate.c
View File

@@ -34,7 +34,7 @@
#include "MOD_modifiertypes.h"
static Mesh *triangulate_mesh(Mesh *mesh, const int quad_method, const int ngon_method, const int flag)
static Mesh *triangulate_mesh(Mesh *mesh, const int quad_method, const int ngon_method, const int min_vertices, const int flag)
{
Mesh *result;
BMesh *bm;
@@ -59,7 +59,7 @@ static Mesh *triangulate_mesh(Mesh *mesh, const int quad_method, const int ngon_
.cd_mask_extra = cddata_masks,
}));
BM_mesh_triangulate(bm, quad_method, ngon_method, false, NULL, NULL, NULL);
BM_mesh_triangulate(bm, quad_method, ngon_method, min_vertices, false, NULL, NULL, NULL);
result = BKE_mesh_from_bmesh_for_eval_nomain(bm, &cddata_masks);
BM_mesh_free(bm);
@@ -98,6 +98,7 @@ static void initData(ModifierData *md)
md->mode |= eModifierMode_Editmode;
tmd->quad_method = MOD_TRIANGULATE_QUAD_SHORTEDGE;
tmd->ngon_method = MOD_TRIANGULATE_NGON_BEAUTY;
tmd->min_vertices = 4;
}
static Mesh *applyModifier(
@@ -107,7 +108,7 @@ static Mesh *applyModifier(
{
TriangulateModifierData *tmd = (TriangulateModifierData *)md;
Mesh *result;
if (!(result = triangulate_mesh(mesh, tmd->quad_method, tmd->ngon_method, tmd->flag))) {
if (!(result = triangulate_mesh(mesh, tmd->quad_method, tmd->ngon_method, tmd->min_vertices, tmd->flag))) {
return mesh;
}