diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-05-26 06:39:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-26 06:42:59 +0300 |
commit | 9ce20d3341cf215233f46f0326a9619fe80b6cb2 (patch) | |
tree | b6717d1b3a98dfbcbdf48b0df033bc051f7cdb3b /source/blender/bmesh/intern | |
parent | eb799dc3501483ff87ec26395bf365b1fbe3dd56 (diff) |
BMesh: join tris now delimits all UV/Color layers
Previously was only checking active layers
Also add delimit by edge seam
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 2ba65f5a1e7..211c53aedca 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -493,6 +493,7 @@ static BMOpDefine bmo_join_triangles_def = { "join_triangles", /* slots_in */ {{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input geometry. */ + {"cmp_seam", BMO_OP_SLOT_BOOL}, {"cmp_sharp", BMO_OP_SLOT_BOOL}, {"cmp_uvs", BMO_OP_SLOT_BOOL}, {"cmp_vcols", BMO_OP_SLOT_BOOL}, |