diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-22 18:53:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-22 19:43:20 +0300 |
| commit | 2fb9a50a4f740fdbec12d3e89fb5a927f10c60e1 (patch) | |
| tree | 13891c5b5b1ba33449e4e114a79a2f88aa760ced /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | c080c096ce38ffd7aca46f97174612fe8773bb08 (diff) | |
Fix T55146: hair + subsurf modifier not positioning hair correctly.
ORIGSPACE data was not being preserved correctly through subsurf.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index b77582b7ec3..19d1d1e0ede 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -594,14 +594,15 @@ 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); + return CDDM_from_mesh_ex(mesh, CD_REFERENCE, CD_MASK_MESH); } -DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh, int alloctype) +DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh, int alloctype, CustomDataMask mask) { CDDerivedMesh *cddm = cdDM_create(__func__); DerivedMesh *dm = &cddm->dm; - CustomDataMask mask = CD_MASK_MESH & (~CD_MASK_MDISPS); + + mask &= ~CD_MASK_MDISPS; /* this does a referenced copy, with an exception for fluidsim */ |