archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: avoid local definitions for one-off args

Browse Source
This commit is contained in:
Campbell Barton
2018-05-04 08:51:04 +02:00
parent 29fc9275c7
commit 14883a0945
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/modifiers/intern/MOD_bevel.c
View File

@@ -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 &&

4
source/blender/modifiers/intern/MOD_wireframe.c
View File

@@ -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;