diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-26 07:27:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-26 07:27:38 +0300 |
| commit | 8715fd092514547460e58d4f8a39b2fb6704e810 (patch) | |
| tree | bbccd07296113eac723afe1643eda40b643ca88c /source/blender/bmesh/intern/bmesh_opdefines.c | |
| parent | 9ce20d3341cf215233f46f0326a9619fe80b6cb2 (diff) | |
BMesh: join tris, split angle limit in two
Use a separate limit for face-angle and shape comparisons.
There was no way to join non-rectangular, co-planer tries.
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_opdefines.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 211c53aedca..ce988c6c6dd 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -487,7 +487,7 @@ static BMOpDefine bmo_create_vert_def = { * Join Triangles. * * Tries to intelligently join triangles according - * to various settings and stuff. + * to angle threshold and delimiters. */ static BMOpDefine bmo_join_triangles_def = { "join_triangles", @@ -498,7 +498,8 @@ static BMOpDefine bmo_join_triangles_def = { {"cmp_uvs", BMO_OP_SLOT_BOOL}, {"cmp_vcols", BMO_OP_SLOT_BOOL}, {"cmp_materials", BMO_OP_SLOT_BOOL}, - {"limit", BMO_OP_SLOT_FLT}, + {"angle_face_threshold", BMO_OP_SLOT_FLT}, + {"angle_shape_threshold", BMO_OP_SLOT_FLT}, {{'\0'}}, }, /* slots_out */ |