diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-27 19:21:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-27 23:17:06 +0300 |
| commit | b4087ea6392e051fd9e4f7ee5207d089a044e15e (patch) | |
| tree | 164c0d165af06bd6257dc003e1164fe226e6ac89 /source/blender/modifiers/intern/MOD_armature.c | |
| parent | 4543da6ca63d227ed9ad809fbbdd765acab7aba6 (diff) | |
Modifiers: Refactor `MOD_deform_mesh_eval_get()` helper a bit.
Now that function also takes expected number of vertices, and do the
checks against generated mesh internally.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_armature.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 3209391d4bc..f37b5d4ec4d 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -136,7 +136,7 @@ static void deformVertsEM( Mesh *mesh, float (*vertexCos)[3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; - Mesh *mesh_src = MOD_get_mesh_eval(ctx->object, em, mesh, NULL, false, false); + Mesh *mesh_src = MOD_deform_mesh_eval_get(ctx->object, em, mesh, NULL, numVerts, false, false); MOD_previous_vcos_store(md, vertexCos); /* if next modifier needs original vertices */ @@ -160,7 +160,7 @@ static void deformMatricesEM( float (*defMats)[3][3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; - Mesh *mesh_src = MOD_get_mesh_eval(ctx->object, em, mesh, NULL, false, false); + Mesh *mesh_src = MOD_deform_mesh_eval_get(ctx->object, em, mesh, NULL, numVerts, false, false); armature_deform_verts(amd->object, ctx->object, mesh_src, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name, NULL); @@ -175,7 +175,7 @@ static void deformMatrices( float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; - Mesh *mesh_src = MOD_get_mesh_eval(ctx->object, NULL, mesh, NULL, false, false); + Mesh *mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, numVerts, false, false); armature_deform_verts(amd->object, ctx->object, mesh_src, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name, NULL); |