diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-25 16:38:26 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-01 19:02:17 +0300 |
| commit | 1553f6b656feed517023dbc07e8c07637732b746 (patch) | |
| tree | a80afe077859479bdec1951a4b4e3a9c262b89b3 /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | 4211d02ab5685f73da6a85a0c130ccf704c66de8 (diff) | |
Introduced CDDM_from_mesh_ex() to create a non-referencing CDDM
This allows the mesh to be freed and the CDDM kept.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index fd076a4e5c6..4d91d99b022 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -594,10 +594,14 @@ DerivedMesh *CDDM_new(int numVerts, int numEdges, int numTessFaces, int numLoops DerivedMesh *CDDM_from_mesh(Mesh *mesh) { + return CDDM_from_mesh_ex(mesh, CD_REFERENCE); +} + +DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh, int alloctype) +{ CDDerivedMesh *cddm = cdDM_create(__func__); DerivedMesh *dm = &cddm->dm; CustomDataMask mask = CD_MASK_MESH & (~CD_MASK_MDISPS); - int alloctype; /* this does a referenced copy, with an exception for fluidsim */ @@ -607,8 +611,6 @@ DerivedMesh *CDDM_from_mesh(Mesh *mesh) dm->deformedOnly = 1; dm->cd_flag = mesh->cd_flag; - alloctype = CD_REFERENCE; - CustomData_merge(&mesh->vdata, &dm->vertData, mask, alloctype, mesh->totvert); CustomData_merge(&mesh->edata, &dm->edgeData, mask, alloctype, |