archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for joining meshes with tfaces.

Browse Source
This commit is contained in:
Brecht Van Lommel
2006-11-21 14:26:25 +00:00
parent 2447adab7a
commit 17a6338736
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/src/meshtools.c
View File

@@ -268,7 +268,7 @@ int join_mesh(void)
me= base->object->data; me= base->object->data;
if(me->totvert) { 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); CustomData_copy_data(&me->vdata, &vdata, 0, vertofs, me->totvert);
dvert= CustomData_get(&vdata, vertofs, CD_MDEFORMVERT); 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_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++) { for(a=0; a<me->totface; a++, mface++) {
mface->v1+= vertofs; mface->v1+= vertofs;
@@ -337,7 +337,7 @@ int join_mesh(void)
if(me->totedge) { if(me->totedge) {
CustomData_merge(&me->edata, &edata, CD_MASK_MESH, CD_DEFAULT, 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++) { for(a=0; a<me->totedge; a++, medge++) {
medge->v1+= vertofs; medge->v1+= vertofs;