Commit: 05da1d7fb2f6dafb35549ae376d909e23396f185
Author: Campbell Barton
Date: Thu Dec 6 08:48:43 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB05da1d7fb2f6dafb35549ae376d909e23396f185
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/editderivedmesh.c
index e6873e66c91,c22ede5ebf1..faac56ad161
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@@ -527,14 -2799,14 +527,14 @@@ static void cage_mapped_verts_callback
}
}
-float (*BKE_editmesh_vertexCos_get(BMEditMesh *em, Scene *scene, int
*r_numVerts))[3]
+float (*BKE_editmesh_vertexCos_get(struct Depsgraph *depsgraph, BMEditMesh
*em, Scene *scene, int *r_numVerts))[3]
{
- Mesh *cage, *final;
- DerivedMesh *cage;
++ 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_derived_cage(scene, em->ob, em, CD_MASK_BAREMESH);
++ 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,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
