From 6f305577b346030249bdb762f887136ff02624e3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 28 Mar 2022 12:29:47 +1100 Subject: Cleanup: use "num" as a suffix in: source/blender/modifiers Also rename DNA struct members. --- source/blender/modifiers/intern/MOD_armature.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_armature.c') diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 5d37ac79fa6..f6e8a26f0e1 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -132,7 +132,7 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, float (*vertexCos)[3], - int numVerts) + int verts_num) { ArmatureModifierData *amd = (ArmatureModifierData *)md; @@ -142,7 +142,7 @@ static void deformVerts(ModifierData *md, ctx->object, vertexCos, NULL, - numVerts, + verts_num, amd->deformflag, amd->vert_coords_prev, amd->defgrp_name, @@ -157,10 +157,10 @@ static void deformVertsEM(ModifierData *md, struct BMEditMesh *em, Mesh *mesh, float (*vertexCos)[3], - int numVerts) + int verts_num) { if (mesh != NULL) { - deformVerts(md, ctx, mesh, vertexCos, numVerts); + deformVerts(md, ctx, mesh, vertexCos, verts_num); return; } @@ -172,7 +172,7 @@ static void deformVertsEM(ModifierData *md, ctx->object, vertexCos, NULL, - numVerts, + verts_num, amd->deformflag, amd->vert_coords_prev, amd->defgrp_name, @@ -188,7 +188,7 @@ static void deformMatricesEM(ModifierData *md, Mesh *UNUSED(mesh), float (*vertexCos)[3], float (*defMats)[3][3], - int numVerts) + int verts_num) { ArmatureModifierData *amd = (ArmatureModifierData *)md; @@ -196,7 +196,7 @@ static void deformMatricesEM(ModifierData *md, ctx->object, vertexCos, defMats, - numVerts, + verts_num, amd->deformflag, NULL, amd->defgrp_name, @@ -208,16 +208,17 @@ static void deformMatrices(ModifierData *md, Mesh *mesh, float (*vertexCos)[3], float (*defMats)[3][3], - int numVerts) + int verts_num) { ArmatureModifierData *amd = (ArmatureModifierData *)md; - Mesh *mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, numVerts, false, false); + Mesh *mesh_src = MOD_deform_mesh_eval_get( + ctx->object, NULL, mesh, NULL, verts_num, false, false); BKE_armature_deform_coords_with_mesh(amd->object, ctx->object, vertexCos, defMats, - numVerts, + verts_num, amd->deformflag, NULL, amd->defgrp_name, -- cgit v1.2.3