diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-08-21 08:04:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-21 08:05:52 +0300 |
commit | 8ffbe398341ca81acbb1515864fa55027fa68766 (patch) | |
tree | d05c952395ed466cc5c497c40a60bb971e59049b /source/blender | |
parent | 666d74e4d6db66dd7a6f57cdd31c5dfc983e59bf (diff) |
Cleanup: pass lattice directly vertex coord utilities
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_lattice.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h index d6df7517ceb..24594da13c6 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -88,8 +88,8 @@ void armature_deform_verts(struct Object *armOb, const char *defgrp_name, struct bGPDstroke *gps); -float (*BKE_lattice_vertexcos_get(struct Object *ob, int *r_numVerts))[3]; -void BKE_lattice_vertexcos_apply(struct Object *ob, const float (*vertexCos)[3]); +float (*BKE_lattice_vertexcos_get(const struct Lattice *lt, int *r_numVerts))[3]; +void BKE_lattice_vertexcos_apply(struct Lattice *lt, const float (*vertexCos)[3]); void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob); diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 44ab4b066c1..3000a8abc08 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -1055,9 +1055,8 @@ void outside_lattice(Lattice *lt) } } -float (*BKE_lattice_vertexcos_get(struct Object *ob, int *r_numVerts))[3] +float (*BKE_lattice_vertexcos_get(const Lattice *lt, int *r_numVerts))[3] { - Lattice *lt = ob->data; int i, numVerts; float(*vertexCos)[3]; @@ -1075,9 +1074,8 @@ float (*BKE_lattice_vertexcos_get(struct Object *ob, int *r_numVerts))[3] return vertexCos; } -void BKE_lattice_vertexcos_apply(struct Object *ob, const float (*vertexCos)[3]) +void BKE_lattice_vertexcos_apply(Lattice *lt, const float (*vertexCos)[3]) { - Lattice *lt = ob->data; int i, numVerts = lt->pntsu * lt->pntsv * lt->pntsw; for (i = 0; i < numVerts; i++) { @@ -1124,21 +1122,21 @@ void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, Scene *scene, Objec } if (!vertexCos) { - vertexCos = BKE_lattice_vertexcos_get(ob_orig, &numVerts); + vertexCos = BKE_lattice_vertexcos_get(ob_orig->data, &numVerts); } mti->deformVerts(md, &mectx, NULL, vertexCos, numVerts); } if (ob->id.tag & LIB_TAG_COPIED_ON_WRITE) { if (vertexCos) { - BKE_lattice_vertexcos_apply(ob, vertexCos); + BKE_lattice_vertexcos_apply(ob->data, vertexCos); MEM_freeN(vertexCos); } } else { /* Displist won't do anything; this is just for posterity's sake until we remove it. */ if (!vertexCos) { - vertexCos = BKE_lattice_vertexcos_get(ob_orig, &numVerts); + vertexCos = BKE_lattice_vertexcos_get(ob_orig->data, &numVerts); } DispList *dl = MEM_callocN(sizeof(*dl), "lt_dl"); |