diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
| commit | ec8d277c64346770b99716b3c1bbdcd07eae26f6 (patch) | |
| tree | e0fc551f658e2585d0ea1c36b8d3e2c373919ef2 /source/blender/blenkernel/intern/mball.c | |
| parent | 4cf069a41d0a3c39a39237656cd7e65be1d37924 (diff) | |
BLI_math rename functions:
- mult_m4_m4m4 -> mul_m4_m4m4
- mult_m3_m3m4 -> mul_m3_m3m4
these temporary names were used to avoid problems when argument order was switched.
Diffstat (limited to 'source/blender/blenkernel/intern/mball.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mball.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 19c98eb5139..43819e1e80e 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -1760,7 +1760,7 @@ static float init_meta(Scene *scene, Object *ob) /* return totsize */ temp2[3][1] = ml->y; temp2[3][2] = ml->z; - mult_m4_m4m4(temp1, temp2, temp3); + mul_m4_m4m4(temp1, temp2, temp3); /* make a copy because of duplicates */ G_mb.mainb[a] = new_pgn_element(sizeof(MetaElem)); @@ -1772,9 +1772,9 @@ static float init_meta(Scene *scene, Object *ob) /* return totsize */ /* mat is the matrix to transform from mball into the basis-mball */ invert_m4_m4(obinv, obmat); - mult_m4_m4m4(temp2, obinv, bob->obmat); + mul_m4_m4m4(temp2, obinv, bob->obmat); /* MetaBall transformation */ - mult_m4_m4m4(mat, temp2, temp1); + mul_m4_m4m4(mat, temp2, temp1); invert_m4_m4(imat, mat); |