[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53693] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: don't call BKE_mesh_tessface_ensure() from DM_to_mesh(), caller must do this instead.
Campbell Barton
ideasman42 at gmail.com
Thu Jan 10 06:50:25 CET 2013
Revision: 53693
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53693
Author: campbellbarton
Date: 2013-01-10 05:50:21 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
don't call BKE_mesh_tessface_ensure() from DM_to_mesh(), caller must do this instead.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-01-10 05:35:10 UTC (rev 53692)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-01-10 05:50:21 UTC (rev 53693)
@@ -485,6 +485,7 @@
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 @@
}
/* 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);
More information about the Bf-blender-cvs
mailing list