diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 12:05:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 12:05:49 +0300 |
| commit | fdc967e616132448e71101fd875101cbb53ebb9e (patch) | |
| tree | 24f06c767015ccf13b5191f06b3027b6d326b12b /source/blender/blenkernel/intern/lattice.c | |
| parent | 50e31136fd5b0d26d1a2880a1c895c2809317d50 (diff) | |
Modifiers stack: port Curve to new Mesh-based system.
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 609c4b95dab..30c839bf766 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -699,7 +699,7 @@ static bool calc_curve_deform(Object *par, float co[3], } void curve_deform_verts( - Object *cuOb, Object *target, DerivedMesh *dm, float (*vertexCos)[3], + Object *cuOb, Object *target, Mesh *mesh, float (*vertexCos)[3], int numVerts, const char *vgroup, short defaxis) { Curve *cu; @@ -735,8 +735,8 @@ void curve_deform_verts( if (defgrp_index != -1) { /* if there's derived data without deformverts, don't use vgroups */ - if (dm) { - dvert = dm->getVertDataArray(dm, CD_MDEFORMVERT); + if (mesh) { + dvert = CustomData_get_layer(&mesh->vdata, CD_MDEFORMVERT); } else if (target->type == OB_LATTICE) { dvert = ((Lattice *)target->data)->dvert; |