diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-24 17:45:35 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-24 17:45:35 +0400 |
commit | 1a55b53375cf45481e3916d9d3a96c7ce4204e73 (patch) | |
tree | e087353ec83945db6a9ee807745b4390a0b0d8ca /source/blender/makesrna/intern/rna_lattice.c | |
parent | c42c9cb234524fcde6248df686d359c2fa827fcd (diff) |
lattice: use functions rather then defines, also added a function to get uvw from an index.
- BKE_lattice_index_from_uvw()
- BKE_lattice_index_to_uvw()
Diffstat (limited to 'source/blender/makesrna/intern/rna_lattice.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_lattice.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c index b2790a25e47..0cd5fec57df 100644 --- a/source/blender/makesrna/intern/rna_lattice.c +++ b/source/blender/makesrna/intern/rna_lattice.c @@ -54,14 +54,14 @@ static void rna_LatticePoint_co_get(PointerRNA *ptr, float *values) { Lattice *lt = (Lattice *)ptr->id.data; BPoint *bp = (BPoint *)ptr->data; - int a = bp - lt->def; - int x = a % lt->pntsu; - int y = (a / lt->pntsu) % lt->pntsv; - int z = (a / (lt->pntsu * lt->pntsv)); - - values[0] = lt->fu + x * lt->du; - values[1] = lt->fv + y * lt->dv; - values[2] = lt->fw + z * lt->dw; + int index = bp - lt->def; + int u, v, w; + + BKE_lattice_index_to_uvw(lt, index, &u, &v, &w); + + values[0] = lt->fu + u * lt->du; + values[1] = lt->fv + v * lt->dv; + values[2] = lt->fw + w * lt->dw; } static void rna_LatticePoint_groups_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) |