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_collision.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_collision.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 2fddef21996..011635e3012 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -105,7 +105,7 @@ static void deformVerts( ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, float (*vertexCos)[3], - int UNUSED(numVerts)) + int numVerts) { CollisionModifierData *collmd = (CollisionModifierData *) md; Mesh *mesh_src; @@ -113,7 +113,7 @@ static void deformVerts( Object *ob = ctx->object; if (mesh == NULL) { - mesh_src = MOD_get_mesh_eval(ob, NULL, NULL, NULL, false, false); + mesh_src = MOD_deform_mesh_eval_get(ob, NULL, NULL, NULL, numVerts, false, false); } else { /* Not possible to use get_mesh() in this case as we'll modify its vertices |