diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-10 09:50:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-10 09:50:21 +0400 |
| commit | ce4116c35c6d36bc147b8e96377bc895555dbf92 (patch) | |
| tree | 44d587abdd6405ef2aaea55710c266b9231635f1 /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 0ce1be552e8d240f8fd17d9b21e045045c85cc5b (diff) | |
don't call BKE_mesh_tessface_ensure() from DM_to_mesh(), caller must do this instead.
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 4ffbc3e6de1..dde1d5870ca 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -485,6 +485,7 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob) totedge = tmp.totedge = dm->getNumEdges(dm); totloop = tmp.totloop = dm->getNumLoops(dm); totpoly = tmp.totpoly = dm->getNumPolys(dm); + tmp.totface = 0; CustomData_copy(&dm->vertData, &tmp.vdata, CD_MASK_MESH, CD_DUPLICATE, totvert); CustomData_copy(&dm->edgeData, &tmp.edata, CD_MASK_MESH, CD_DUPLICATE, totedge); @@ -541,9 +542,10 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob) } /* yes, must be before _and_ after tessellate */ - mesh_update_customdata_pointers(&tmp, TRUE); + mesh_update_customdata_pointers(&tmp, false); - BKE_mesh_tessface_calc(&tmp); + /* since 2.65 caller must do! */ + // BKE_mesh_tessface_calc(&tmp); CustomData_free(&me->vdata, me->totvert); CustomData_free(&me->edata, me->totedge); |