From a7b44c82e5b90e83a588fabb22fda5ac41891bdf Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 29 Oct 2013 02:42:51 +0000 Subject: Triangulate Modifier: using different ngon and quad methods Quads: Beauty, Fixed, Fixed Alternate, Shortest Diagonal Ngons: Beauty, Scanfill * Shortest Diagonal is the default method in the modifier (popular elsewhere), but beauty is the default in Ctrl+T). * Remove the need for output slot and beauty operator to be called after Clt+T Patch with collaborations and reviewed by Campbell Barton --- source/blender/makesdna/DNA_modifier_types.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna/DNA_modifier_types.h') diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 799968335b7..43de7166c4f 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -1177,11 +1177,27 @@ typedef struct TriangulateModifierData { ModifierData modifier; int flag; + int quad_method; + int ngon_method; int pad; } TriangulateModifierData; enum { - MOD_TRIANGULATE_BEAUTY = (1 << 0), + MOD_TRIANGULATE_BEAUTY = (1 << 0), /* deprecated */ +}; + +/* Triangulate methods - NGons */ +enum { + MOD_TRIANGULATE_NGON_BEAUTY = 0, + MOD_TRIANGULATE_NGON_SCANFILL, +}; + +/* Triangulate methods - Quads */ +enum { + MOD_TRIANGULATE_QUAD_BEAUTY = 0, + MOD_TRIANGULATE_QUAD_FIXED, + MOD_TRIANGULATE_QUAD_ALTERNATE, + MOD_TRIANGULATE_QUAD_SHORTEDGE }; typedef struct LaplacianSmoothModifierData { -- cgit v1.2.3