From da5b6ed75bf08141dd19a0cc143d1a91b14a0f24 Mon Sep 17 00:00:00 2001
From: Ish Bosamiya <ishbosamiya>
Date: Fri, 22 Mar 2019 17:55:51 +0100
Subject: Modifiers: add minimum number of vertices to triangulate modifier.

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

Differential Revision: https://developer.blender.org/D4367
---
 source/blender/modifiers/intern/MOD_triangulate.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source/blender/modifiers')

diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c
index e39698e142e..6bd24620da2 100644
--- a/source/blender/modifiers/intern/MOD_triangulate.c
+++ b/source/blender/modifiers/intern/MOD_triangulate.c
@@ -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;
 	}
 
-- 
cgit v1.2.3