diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-24 06:45:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-24 06:48:17 +0300 |
| commit | 4b2b8a0c3fdcd190cf91b304239a73e4c4fca80c (patch) | |
| tree | cfb42e581880c0e3f6a1eb3b89a4dc76c73d6676 /source/blender/bmesh/intern | |
| parent | 175326fed75a829b2ded759c31e915a3f2deba95 (diff) | |
Fix T57351: Deform modifiers skipped in editmode
Diffstat (limited to 'source/blender/bmesh/intern')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index ef5864ba220..9f1b032ea0b 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -985,6 +985,14 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *me, const int64_t cd_mask_extra) CustomData_add_layer(&me->ldata, CD_MLOOP, CD_CALLOC, NULL, bm->totloop); CustomData_add_layer(&me->pdata, CD_MPOLY, CD_CALLOC, NULL, bm->totface); + /* don't process shapekeys, we only feed them through the modifier stack as needed, + * e.g. for applying modifiers or the like*/ + const CustomDataMask mask = (CD_MASK_DERIVEDMESH | cd_mask_extra) & ~CD_MASK_SHAPEKEY; + CustomData_merge(&bm->vdata, &me->vdata, mask, CD_CALLOC, me->totvert); + CustomData_merge(&bm->edata, &me->edata, mask, CD_CALLOC, me->totedge); + CustomData_merge(&bm->ldata, &me->ldata, mask, CD_CALLOC, me->totloop); + CustomData_merge(&bm->pdata, &me->pdata, mask, CD_CALLOC, me->totpoly); + BKE_mesh_update_customdata_pointers(me, false); BMIter iter; @@ -1007,14 +1015,6 @@ void BM_mesh_bm_to_me_for_eval(BMesh *bm, Mesh *me, const int64_t cd_mask_extra) /* don't add origindex layer if one already exists */ add_orig = !CustomData_has_layer(&bm->pdata, CD_ORIGINDEX); - /* don't process shapekeys, we only feed them through the modifier stack as needed, - * e.g. for applying modifiers or the like*/ - const CustomDataMask mask = (CD_MASK_DERIVEDMESH | cd_mask_extra) & ~CD_MASK_SHAPEKEY; - CustomData_merge(&bm->vdata, &me->vdata, mask, CD_CALLOC, me->totvert); - CustomData_merge(&bm->edata, &me->edata, mask, CD_CALLOC, me->totedge); - CustomData_merge(&bm->ldata, &me->ldata, mask, CD_CALLOC, me->totloop); - CustomData_merge(&bm->pdata, &me->pdata, mask, CD_CALLOC, me->totpoly); - index = CustomData_get_layer(&me->vdata, CD_ORIGINDEX); BM_ITER_MESH_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, i) { |