diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-05 09:56:41 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-05 09:56:41 +0400 |
| commit | 62087935ec92e24bce362489cadc944bc256e8cc (patch) | |
| tree | b8056f1bfebd2812a5a8ed6120ba168ee79bd28f /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 998b9241bedea82f4501b4c4e5453d7becb07d3e (diff) | |
Fix #35209: cycles generated texture coordinates did not stick to deforming meshes.
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 8efd9ae133e..b728bbcf047 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -470,7 +470,7 @@ void DM_update_tessface_data(DerivedMesh *dm) dm->dirty &= ~DM_DIRTY_TESS_CDLAYERS; } -void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob) +void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob, CustomDataMask mask) { /* dm might depend on me, so we need to do everything with a local copy */ Mesh tmp = *me; @@ -489,10 +489,10 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob) 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); - CustomData_copy(&dm->loopData, &tmp.ldata, CD_MASK_MESH, CD_DUPLICATE, totloop); - CustomData_copy(&dm->polyData, &tmp.pdata, CD_MASK_MESH, CD_DUPLICATE, totpoly); + CustomData_copy(&dm->vertData, &tmp.vdata, mask, CD_DUPLICATE, totvert); + CustomData_copy(&dm->edgeData, &tmp.edata, mask, CD_DUPLICATE, totedge); + CustomData_copy(&dm->loopData, &tmp.ldata, mask, CD_DUPLICATE, totloop); + CustomData_copy(&dm->polyData, &tmp.pdata, mask, CD_DUPLICATE, totpoly); tmp.cd_flag = dm->cd_flag; if (CustomData_has_layer(&dm->vertData, CD_SHAPEKEY)) { |