From 14883a0945d486cbc8794e8493664d3c202beab2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 4 May 2018 08:51:04 +0200 Subject: Cleanup: avoid local definitions for one-off args --- source/blender/modifiers/intern/MOD_bevel.c | 20 ++++++++++---------- source/blender/modifiers/intern/MOD_wireframe.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'source/blender') diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 325b70ddc5e..aa07aea3e11 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -106,14 +106,15 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes const int mat = CLAMPIS(bmd->mat, -1, ctx->object->totcol - 1); const bool loop_slide = (bmd->flags & MOD_BEVEL_EVEN_WIDTHS) == 0; - const struct BMeshCreateParams bmcp = {0}; - const struct BMeshFromMeshParams bmfmp = { - .calc_face_normal = true, - .add_key_index = false, - .use_shapekey = true, - .active_shapekey = ctx->object->shapenr, - }; - bm = BKE_mesh_to_bmesh_ex(mesh, &bmcp, &bmfmp); + bm = BKE_mesh_to_bmesh_ex( + mesh, + &(struct BMeshCreateParams){0}, + &(struct BMeshFromMeshParams){ + .calc_face_normal = true, + .add_key_index = false, + .use_shapekey = true, + .active_shapekey = ctx->object->shapenr, + }); if ((bmd->lim_flags & MOD_BEVEL_VGROUP) && bmd->defgrp_name[0]) modifier_get_vgroup_mesh(ctx->object, mesh, bmd->defgrp_name, &dvert, &vgroup); @@ -176,8 +177,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes vertex_only, bmd->lim_flags & MOD_BEVEL_WEIGHT, do_clamp, dvert, vgroup, mat, loop_slide); - struct BMeshToMeshParams bmmp = {0}; - result = BKE_bmesh_to_mesh(bm, &bmmp); + result = BKE_bmesh_to_mesh(bm, &(struct BMeshToMeshParams){0}); BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c index b2fe592cb37..3c6717d3b36 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.c +++ b/source/blender/modifiers/intern/MOD_wireframe.c @@ -80,7 +80,7 @@ static Mesh *WireframeModifier_do(WireframeModifierData *wmd, Object *ob, Mesh * bm = BKE_mesh_to_bmesh_ex( mesh, - &((struct BMeshCreateParams){0}), + &(struct BMeshCreateParams){0}, &(struct BMeshFromMeshParams){ .calc_face_normal = true, .add_key_index = false, @@ -103,7 +103,7 @@ static Mesh *WireframeModifier_do(WireframeModifierData *wmd, Object *ob, Mesh * MAX2(ob->totcol - 1, 0), false); - result = BKE_bmesh_to_mesh(bm, (&(struct BMeshToMeshParams){0})); + 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