diff options
| author | Alexander Pinzon <apinzonf@gmail.com> | 2013-11-13 00:30:26 +0400 |
|---|---|---|
| committer | Alexander Pinzon <apinzonf@gmail.com> | 2013-11-13 00:30:26 +0400 |
| commit | 494d2f98067268da2e2d17dd026a661a00f507c9 (patch) | |
| tree | 680239f722ec81e3b5675eb8b76eb0bd05539619 /source/blender/makesdna/DNA_modifier_types.h | |
| parent | 7d0c00ec90194f2e2c0655fff3eea6492bbe2be0 (diff) | |
| parent | c53f80aeed256874c1e2bc683400f816ed80e469 (diff) | |
svn merge ^/trunk/blender 60972:61239
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 13bd99eb78c..24817fa8f43 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -1178,11 +1178,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 { |