diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-02-27 09:38:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-27 09:38:48 +0400 |
| commit | 67f38af41510dbab4b4fecda417334a1997a119f (patch) | |
| tree | c2c04a180e7bc5a7354d420cbcfdf7ca6c607998 /source/blender/editors | |
| parent | aa80a698397d7566a05770a0eb172480c7696dc3 (diff) | |
fix for own regression - joining meshes didn't merge customdata flags (could loose crease/bevel weights).
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index f983a43f573..378f6374336 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -149,7 +149,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - /* remove tessface to ensure we don't old references to invalid faces */ + /* remove tessface to ensure we don't hold references to invalid faces */ BKE_mesh_tessface_clear(me); /* new material indices and material array */ @@ -309,6 +309,10 @@ int join_mesh_exec(bContext *C, wmOperator *op) me = base->object->data; if (me->totvert) { + + /* merge customdata flag */ + ((Mesh *)ob->data)->cd_flag |= me->cd_flag; + /* standard data */ CustomData_merge(&me->vdata, &vdata, CD_MASK_MESH, CD_DEFAULT, totvert); CustomData_copy_data(&me->vdata, &vdata, 0, vertofs, me->totvert); |