diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-06 00:48:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-06 00:48:43 +0300 |
| commit | 05da1d7fb2f6dafb35549ae376d909e23396f185 (patch) | |
| tree | 0b908d0b00821a6bf6742c199ca583a1aac1ea92 /source/blender/blenkernel/intern/editderivedmesh.c | |
| parent | 5bc7b9c3c631b4346efe8415fc6d8a32e87971c7 (diff) | |
| parent | ad2e68b8268cdf6a220b46b0dca977fccce7af91 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/editderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index e6873e66c91..faac56ad161 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -529,12 +529,12 @@ static void cage_mapped_verts_callback( float (*BKE_editmesh_vertexCos_get(struct Depsgraph *depsgraph, BMEditMesh *em, Scene *scene, int *r_numVerts))[3] { - Mesh *cage, *final; + Mesh *cage; BLI_bitmap *visit_bitmap; struct CageUserData data; float (*cos_cage)[3]; - cage = editbmesh_get_eval_cage_and_final(depsgraph, scene, em->ob, em, CD_MASK_BAREMESH, &final); + cage = editbmesh_get_eval_cage(depsgraph, scene, em->ob, em, CD_MASK_BAREMESH); cos_cage = MEM_callocN(sizeof(*cos_cage) * em->bm->totvert, "bmbvh cos_cage"); /* when initializing cage verts, we only want the first cage coordinate for each vertex, |