diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedbmesh.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 20 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 8 |
3 files changed, 16 insertions, 18 deletions
diff --git a/source/blender/blenkernel/intern/editderivedbmesh.c b/source/blender/blenkernel/intern/editderivedbmesh.c index e470cfb9f5c..0bc105ca501 100644 --- a/source/blender/blenkernel/intern/editderivedbmesh.c +++ b/source/blender/blenkernel/intern/editderivedbmesh.c @@ -1613,12 +1613,6 @@ DerivedMesh *getEditDerivedBMesh(BMEditMesh *em, Object *UNUSED(ob), CustomData_from_bmeshpoly(&bmdm->dm.faceData, &em->bm->pdata, &em->bm->ldata, 0); - bmdm->dm.numVertData = bm->totvert; - bmdm->dm.numEdgeData = bm->totedge; - bmdm->dm.numFaceData = em->tottri; - bmdm->dm.numLoopData = bm->totloop; - bmdm->dm.numPolyData = bm->totface; - bmdm->dm.getVertCos = bmDM_getVertCos; bmdm->dm.getMinMax = bmDM_getMinMax; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 16cf18b9a50..456a24a1417 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -736,9 +736,9 @@ void mesh_get_texspace(Mesh *me, float *loc_r, float *rot_r, float *size_r) tex_space_mesh(me); } - if (loc_r) VECCOPY(loc_r, me->loc); - if (rot_r) VECCOPY(rot_r, me->rot); - if (size_r) VECCOPY(size_r, me->size); + if (loc_r) copy_v3_v3(loc_r, me->loc); + if (rot_r) copy_v3_v3(rot_r, me->rot); + if (size_r) copy_v3_v3(size_r, me->size); } float *get_mesh_orco_verts(Object *ob) @@ -1118,7 +1118,7 @@ void mball_to_mesh(ListBase *lb, Mesh *me) nors= dl->nors; verts= dl->verts; while(a--) { - VECCOPY(mvert->co, verts); + copy_v3_v3(mvert->co, verts); normal_float_to_short_v3(mvert->no, nors); mvert++; nors+= 3; @@ -1231,7 +1231,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int a= dl->parts*dl->nr; data= dl->verts; while(a--) { - VECCOPY(mvert->co, data); + copy_v3_v3(mvert->co, data); data+=3; vertcount++; mvert++; @@ -1254,7 +1254,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int a= dl->parts*dl->nr; data= dl->verts; while(a--) { - VECCOPY(mvert->co, data); + copy_v3_v3(mvert->co, data); data+=3; vertcount++; mvert++; @@ -1277,7 +1277,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int a= dl->nr; data= dl->verts; while(a--) { - VECCOPY(mvert->co, data); + copy_v3_v3(mvert->co, data); data+=3; vertcount++; mvert++; @@ -1305,7 +1305,7 @@ int nurbs_to_mdata_customdb(Object *ob, ListBase *dispbase, MVert **allvert, int a= dl->parts*dl->nr; data= dl->verts; while(a--) { - VECCOPY(mvert->co, data); + copy_v3_v3(mvert->co, data); data+=3; vertcount++; mvert++; @@ -1767,7 +1767,7 @@ void mesh_calc_normals(MVert *mverts, int numVerts, MLoop *mloop, MPoly *mpolys, mf = mfaces; for (i=0; i<numFaces; i++, mf++, origIndexFace++) { if (*origIndexFace < numPolys) { - VECCOPY(fnors[i], pnors[*origIndexFace]); + copy_v3_v3(fnors[i], pnors[*origIndexFace]); } else { /*eek, we're not corrusponding to polys*/ printf("error in mesh_calc_normals; tesselation face indices are incorrect. normals may look bad.\n"); @@ -2448,7 +2448,7 @@ static void mesh_calc_ngon_normal(MPoly *mpoly, MLoop *loopstart, { MVert *v1, *v2, *v3; - double u[3], v[3], w[3]; + double u[3], v[3], w[3]; double n[3] = {0.0, 0.0, 0.0}, l; int i; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index d0e34ab371c..ed7a22b5e0b 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2556,15 +2556,19 @@ void object_handle_update(Scene *scene, Object *ob) BLI_assert((scene->customdata_mask & CD_MASK_BAREMESH) == CD_MASK_BAREMESH); if(em) { makeDerivedMesh(scene, ob, em, scene->customdata_mask, 0); /* was CD_MASK_BAREMESH */ - } else + } + else { makeDerivedMesh(scene, ob, NULL, scene->customdata_mask, 0); + } #else /* ensure CD_MASK_BAREMESH for now */ BMEditMesh *em = (ob == scene->obedit)? ((Mesh*)ob->data)->edit_btmesh : NULL; if(em) { makeDerivedMesh(scene, ob, em, scene->customdata_mask | CD_MASK_BAREMESH, 0); /* was CD_MASK_BAREMESH */ - } else + } + else { makeDerivedMesh(scene, ob, NULL, scene->customdata_mask | CD_MASK_BAREMESH, 0); + } #endif } |