diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-05 16:14:48 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-05 16:14:48 +0300 |
commit | 112cd86eb5974d653b9f26f333be5291ce9274da (patch) | |
tree | b63190f4597839381ac2bccc8376fec3881cc92b | |
parent | 5f737cc18fb9d4385d76a9cc652fc4e1a32bbd34 (diff) |
Cleanup: Remove unused argument
-rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/crazyspace.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_iterators.c | 6 |
4 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index f835f4332ed..b1ebd2903ec 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -455,8 +455,7 @@ struct Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph, const struct CustomData_MeshMasks *dataMask); struct Mesh *editbmesh_get_eval_cage_from_orig(struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *, - struct BMEditMesh *em, + struct Object *object, const struct CustomData_MeshMasks *dataMask); struct Mesh *editbmesh_get_eval_cage_and_final(struct Depsgraph *depsgraph, struct Scene *scene, diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 684ac1d02fd..19f92f0b361 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2369,7 +2369,6 @@ Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph, Mesh *editbmesh_get_eval_cage_from_orig(struct Depsgraph *depsgraph, Scene *scene, Object *obedit, - BMEditMesh *UNUSED(em), const CustomData_MeshMasks *dataMask) { BLI_assert((obedit->id.tag & LIB_TAG_COPIED_ON_WRITE) == 0); diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c index 3b46f491f11..a55579d9b61 100644 --- a/source/blender/blenkernel/intern/crazyspace.c +++ b/source/blender/blenkernel/intern/crazyspace.c @@ -117,8 +117,7 @@ float (*BKE_crazyspace_get_mapped_editverts(struct Depsgraph *depsgraph, /* now get the cage */ vertexcos = MEM_mallocN(sizeof(*vertexcos) * nverts, "vertexcos map"); - me_eval = editbmesh_get_eval_cage_from_orig( - depsgraph, scene, obedit, me->edit_mesh, &CD_MASK_BAREMESH); + me_eval = editbmesh_get_eval_cage_from_orig(depsgraph, scene, obedit, &CD_MASK_BAREMESH); mesh_get_mapped_verts_coords(me_eval, vertexcos, nverts); diff --git a/source/blender/editors/space_view3d/view3d_iterators.c b/source/blender/editors/space_view3d/view3d_iterators.c index b6efc0ff136..6ed0508f09f 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.c +++ b/source/blender/editors/space_view3d/view3d_iterators.c @@ -170,7 +170,7 @@ void mesh_foreachScreenVert( foreachScreenVert_userData data; Mesh *me = editbmesh_get_eval_cage_from_orig( - vc->depsgraph, vc->scene, vc->obedit, vc->em, &CD_MASK_BAREMESH); + vc->depsgraph, vc->scene, vc->obedit, &CD_MASK_BAREMESH); ED_view3d_check_mats_rv3d(vc->rv3d); @@ -233,7 +233,7 @@ void mesh_foreachScreenEdge(ViewContext *vc, foreachScreenEdge_userData data; Mesh *me = editbmesh_get_eval_cage_from_orig( - vc->depsgraph, vc->scene, vc->obedit, vc->em, &CD_MASK_BAREMESH); + vc->depsgraph, vc->scene, vc->obedit, &CD_MASK_BAREMESH); ED_view3d_check_mats_rv3d(vc->rv3d); @@ -284,7 +284,7 @@ void mesh_foreachScreenFace( foreachScreenFace_userData data; Mesh *me = editbmesh_get_eval_cage_from_orig( - vc->depsgraph, vc->scene, vc->obedit, vc->em, &CD_MASK_BAREMESH); + vc->depsgraph, vc->scene, vc->obedit, &CD_MASK_BAREMESH); ED_view3d_check_mats_rv3d(vc->rv3d); data.vc = *vc; |