From bdd5617c5442f0ba05a54f88d16b8d3be2f5278f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 4 May 2018 09:04:33 +0200 Subject: Cleanup: avoid local definitions for one-off args --- source/blender/blenkernel/intern/mesh.c | 15 ++++++++------- source/blender/modifiers/intern/MOD_armature.c | 6 ++---- source/blender/modifiers/intern/MOD_lattice.c | 3 +-- source/blender/modifiers/intern/MOD_skin.c | 3 +-- 4 files changed, 12 insertions(+), 15 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 9bd1b587abd..2baa8c6edf4 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -691,13 +691,14 @@ BMesh *BKE_mesh_to_bmesh( Mesh *me, Object *ob, const bool add_key_index, const struct BMeshCreateParams *params) { - struct BMeshFromMeshParams convert_params = { - .calc_face_normal = false, - .add_key_index = add_key_index, - .use_shapekey = true, - .active_shapekey = ob->shapenr, - }; - return BKE_mesh_to_bmesh_ex(me, params, &convert_params); + return BKE_mesh_to_bmesh_ex( + me, params, + &(struct BMeshFromMeshParams){ + .calc_face_normal = false, + .add_key_index = add_key_index, + .use_shapekey = true, + .active_shapekey = ob->shapenr, + }); } Mesh *BKE_bmesh_to_mesh(BMesh *bm, const struct BMeshToMeshParams *params) diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index d48c4e2549d..488d04a1466 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -137,8 +137,7 @@ static void deformVertsEM( Mesh *mesh_src = mesh; if (!mesh) { - struct BMeshToMeshParams params = {0}; - mesh_src = BKE_bmesh_to_mesh(em->bm, ¶ms); + mesh_src = BKE_bmesh_to_mesh(em->bm, &(struct BMeshToMeshParams){0}); } modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ @@ -167,8 +166,7 @@ static void deformMatricesEM( Mesh *mesh_src = mesh; if (!mesh) { - struct BMeshToMeshParams params = {0}; - mesh_src = BKE_bmesh_to_mesh(em->bm, ¶ms); + mesh_src = BKE_bmesh_to_mesh(em->bm, &(struct BMeshToMeshParams){0}); } armature_deform_verts(amd->object, ctx->object, mesh_src, vertexCos, defMats, numVerts, diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index 9688b80113b..25f1ae1a687 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -123,8 +123,7 @@ static void deformVertsEM( struct Mesh *mesh_src = mesh; if (!mesh) { - struct BMeshToMeshParams params = {0}; - mesh_src = BKE_bmesh_to_mesh(em->bm, ¶ms); + mesh_src = BKE_bmesh_to_mesh(em->bm, &(struct BMeshToMeshParams){0}); } deformVerts(md, ctx, mesh_src, vertexCos, numVerts); diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index b99d73c316d..080706c00c5 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -1864,8 +1864,7 @@ static Mesh *base_skin(Mesh *origmesh, if (!bm) return NULL; - struct BMeshToMeshParams bmtmp = {0}; - result = BKE_bmesh_to_mesh(bm, &bmtmp); + result = BKE_bmesh_to_mesh(bm, &(struct BMeshToMeshParams){0}); BM_mesh_free(bm); result->runtime.cd_dirty_vert |= CD_MASK_NORMAL; -- cgit v1.2.3