diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-11-21 17:26:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-11-21 17:26:25 +0300 |
| commit | 17a63387366e64ea637cb2324f6b020f7c943fda (patch) | |
| tree | 6febe0e36bbae91e58304bd6c6f9fe8669c8bf25 /source/blender/src/meshtools.c | |
| parent | 2447adab7af83727227b6a2a0f773080834dccdf (diff) | |
Fix for joining meshes with tfaces.
Diffstat (limited to 'source/blender/src/meshtools.c')
| -rw-r--r-- | source/blender/src/meshtools.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index e8fd8d947c9..28a880efb5b 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -268,7 +268,7 @@ int join_mesh(void) me= base->object->data; if(me->totvert) { - CustomData_merge(&me->fdata, &fdata, CD_MASK_MESH, CD_DEFAULT, totface); + CustomData_merge(&me->vdata, &vdata, CD_MASK_MESH, CD_DEFAULT, totvert); CustomData_copy_data(&me->vdata, &vdata, 0, vertofs, me->totvert); dvert= CustomData_get(&vdata, vertofs, CD_MDEFORMVERT); @@ -321,7 +321,7 @@ int join_mesh(void) } CustomData_merge(&me->fdata, &fdata, CD_MASK_MESH, CD_DEFAULT, totface); - CustomData_copy_data(&me->fdata, &fdata, 0, vertofs, me->totface); + CustomData_copy_data(&me->fdata, &fdata, 0, faceofs, me->totface); for(a=0; a<me->totface; a++, mface++) { mface->v1+= vertofs; @@ -337,7 +337,7 @@ int join_mesh(void) if(me->totedge) { CustomData_merge(&me->edata, &edata, CD_MASK_MESH, CD_DEFAULT, totedge); - CustomData_copy_data(&me->edata, &edata, 0, vertofs, me->totedge); + CustomData_copy_data(&me->edata, &edata, 0, edgeofs, me->totedge); for(a=0; a<me->totedge; a++, medge++) { medge->v1+= vertofs; |