diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_cast.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_cast.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index fb395631451..3916551bc90 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -96,7 +96,7 @@ static void sphere_do(CastModifierData *cmd, Object *ob, Mesh *mesh, float (*vertexCos)[3], - int numVerts) + int verts_num) { MDeformVert *dvert = NULL; const bool invert_vgroup = (cmd->flag & MOD_CAST_INVERT_VGROUP) != 0; @@ -159,17 +159,17 @@ static void sphere_do(CastModifierData *cmd, } if (len <= 0) { - for (i = 0; i < numVerts; i++) { + for (i = 0; i < verts_num; i++) { len += len_v3v3(center, vertexCos[i]); } - len /= numVerts; + len /= verts_num; if (len == 0.0f) { len = 10.0f; } } - for (i = 0; i < numVerts; i++) { + for (i = 0; i < verts_num; i++) { float tmp_co[3]; copy_v3_v3(tmp_co, vertexCos[i]); @@ -237,7 +237,7 @@ static void cuboid_do(CastModifierData *cmd, Object *ob, Mesh *mesh, float (*vertexCos)[3], - int numVerts) + int verts_num) { MDeformVert *dvert = NULL; int defgrp_index; @@ -312,13 +312,13 @@ static void cuboid_do(CastModifierData *cmd, /* let the center of the ctrl_ob be part of the bound box: */ minmax_v3v3_v3(min, max, center); - for (i = 0; i < numVerts; i++) { + for (i = 0; i < verts_num; i++) { sub_v3_v3v3(vec, vertexCos[i], center); minmax_v3v3_v3(min, max, vec); } } else { - for (i = 0; i < numVerts; i++) { + for (i = 0; i < verts_num; i++) { minmax_v3v3_v3(min, max, vertexCos[i]); } } @@ -347,7 +347,7 @@ static void cuboid_do(CastModifierData *cmd, bb[4][2] = bb[5][2] = bb[6][2] = bb[7][2] = max[2]; /* ready to apply the effect, one vertex at a time */ - for (i = 0; i < numVerts; i++) { + for (i = 0; i < verts_num; i++) { int octant, coord; float d[3], dmax, apex[3], fbb; float tmp_co[3]; @@ -460,21 +460,21 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, float (*vertexCos)[3], - int numVerts) + int verts_num) { CastModifierData *cmd = (CastModifierData *)md; Mesh *mesh_src = NULL; if (ctx->object->type == OB_MESH && cmd->defgrp_name[0] != '\0') { /* mesh_src is only needed for vgroups. */ - mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, numVerts, false, false); + mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, verts_num, false, false); } if (cmd->type == MOD_CAST_TYPE_CUBOID) { - cuboid_do(cmd, ctx, ctx->object, mesh_src, vertexCos, numVerts); + cuboid_do(cmd, ctx, ctx->object, mesh_src, vertexCos, verts_num); } else { /* MOD_CAST_TYPE_SPHERE or MOD_CAST_TYPE_CYLINDER */ - sphere_do(cmd, ctx, ctx->object, mesh_src, vertexCos, numVerts); + sphere_do(cmd, ctx, ctx->object, mesh_src, vertexCos, verts_num); } if (!ELEM(mesh_src, NULL, mesh)) { @@ -487,17 +487,18 @@ static void deformVertsEM(ModifierData *md, struct BMEditMesh *editData, Mesh *mesh, float (*vertexCos)[3], - int numVerts) + int verts_num) { CastModifierData *cmd = (CastModifierData *)md; Mesh *mesh_src = NULL; if (cmd->defgrp_name[0] != '\0') { - mesh_src = MOD_deform_mesh_eval_get(ctx->object, editData, mesh, NULL, numVerts, false, false); + mesh_src = MOD_deform_mesh_eval_get( + ctx->object, editData, mesh, NULL, verts_num, false, false); } if (mesh && mesh->runtime.wrapper_type == ME_WRAPPER_TYPE_MDATA) { - BLI_assert(mesh->totvert == numVerts); + BLI_assert(mesh->totvert == verts_num); } /* TODO(Campbell): use edit-mode data only (remove this line). */ @@ -506,10 +507,10 @@ static void deformVertsEM(ModifierData *md, } if (cmd->type == MOD_CAST_TYPE_CUBOID) { - cuboid_do(cmd, ctx, ctx->object, mesh_src, vertexCos, numVerts); + cuboid_do(cmd, ctx, ctx->object, mesh_src, vertexCos, verts_num); } else { /* MOD_CAST_TYPE_SPHERE or MOD_CAST_TYPE_CYLINDER */ - sphere_do(cmd, ctx, ctx->object, mesh_src, vertexCos, numVerts); + sphere_do(cmd, ctx, ctx->object, mesh_src, vertexCos, verts_num); } if (!ELEM(mesh_src, NULL, mesh)) { |