diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-02 14:42:04 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-02 14:42:09 +0300 |
| commit | 1f8720cf05035f9c6fa0bc54376203b5395fd34e (patch) | |
| tree | eee2f32f314164e3db837c09829f29576e1ef95d /source/blender/blenkernel/intern/lattice.c | |
| parent | d09920687c4474f5f6ccf0f089d359f69932afac (diff) | |
Modifiers: ported Lattice modifier DerivedMesh → Mesh
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 7ec7da74e55..6039826909b 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -849,7 +849,7 @@ void curve_deform_vector(Object *cuOb, Object *target, } -void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm, +void lattice_deform_verts(Object *laOb, Object *target, Mesh *mesh, float (*vertexCos)[3], int numVerts, const char *vgroup, float fac) { LatticeDeformData *lattice_deform_data; @@ -867,8 +867,8 @@ void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm, */ if (target && target->type == OB_MESH) { /* if there's derived data without deformverts, don't use vgroups */ - if (dm) { - use_vgroups = (dm->getVertDataArray(dm, CD_MDEFORMVERT) != NULL); + if (mesh) { + use_vgroups = (mesh->dvert != NULL); } else { Mesh *me = target->data; @@ -884,11 +884,12 @@ void lattice_deform_verts(Object *laOb, Object *target, DerivedMesh *dm, const int defgrp_index = defgroup_name_index(target, vgroup); float weight; - if (defgrp_index >= 0 && (me->dvert || dm)) { + if (defgrp_index >= 0 && (me->dvert || mesh)) { MDeformVert *dvert = me->dvert; for (a = 0; a < numVerts; a++, dvert++) { - if (dm) dvert = dm->getVertData(dm, a, CD_MDEFORMVERT); + /* TODO(sybren): take out of the loop and move to above assignment of dvert */ + if (mesh) dvert = mesh->dvert + a; weight = defvert_find_weight(dvert, defgrp_index); |