diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-06 05:45:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-06 05:45:29 +0400 |
| commit | b03bc88d215f8b42a2aee53dd9925ed341702542 (patch) | |
| tree | 6a606aa758cceb3b7d08c335efe631d00db1734c /source/blender/blenkernel/intern | |
| parent | ce2e2b141e67e5be8cc85bc394dc6ca9e15f774b (diff) | |
replace mul_serie_m4 with mul_m4_m4m4 when only 3 args are given
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 15 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 2 |
3 files changed, 9 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index ef1235c2b64..eda770ddf30 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -1227,7 +1227,7 @@ static void followpath_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstra copy_v3_v3(totmat[3], vec); - mul_serie_m4(ct->matrix, ct->tar->obmat, totmat, NULL, NULL, NULL, NULL, NULL, NULL); + mul_m4_m4m4(ct->matrix, ct->tar->obmat, totmat); } } } @@ -1253,7 +1253,7 @@ static void followpath_evaluate(bConstraint *con, bConstraintOb *cob, ListBase * mat4_to_size(size, cob->matrix); /* apply targetmat - containing location on path, and rotation */ - mul_serie_m4(cob->matrix, ct->matrix, obmat, NULL, NULL, NULL, NULL, NULL, NULL); + mul_m4_m4m4(cob->matrix, ct->matrix, obmat); /* un-apply scaling caused by path */ if ((data->followflag & FOLLOWPATH_RADIUS) == 0) { /* XXX - assume that scale correction means that radius will have some scale error in it - Campbell */ @@ -3122,7 +3122,7 @@ static void clampto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar unit_m4(totmat); copy_v3_v3(totmat[3], vec); - mul_serie_m4(targetMatrix, ct->tar->obmat, totmat, NULL, NULL, NULL, NULL, NULL, NULL); + mul_m4_m4m4(targetMatrix, ct->tar->obmat, totmat); } } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 7aa23dc6c2b..150c20d047d 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2038,15 +2038,13 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[4 } } - if (ok) mul_serie_m4(totmat, par->obmat, tmat, - NULL, NULL, NULL, NULL, NULL, NULL); + if (ok) mul_m4_m4m4(totmat, par->obmat, tmat); else copy_m4_m4(totmat, par->obmat); break; case PARBONE: ob_parbone(ob, par, tmat); - mul_serie_m4(totmat, par->obmat, tmat, - NULL, NULL, NULL, NULL, NULL, NULL); + mul_m4_m4m4(totmat, par->obmat, tmat); break; case PARVERT1: @@ -2062,8 +2060,7 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[4 case PARVERT3: ob_parvert3(ob, par, tmat); - mul_serie_m4(totmat, par->obmat, tmat, - NULL, NULL, NULL, NULL, NULL, NULL); + mul_m4_m4m4(totmat, par->obmat, tmat); break; case PARSKEL: @@ -2072,10 +2069,8 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[4 } /* total */ - mul_serie_m4(tmat, totmat, ob->parentinv, - NULL, NULL, NULL, NULL, NULL, NULL); - mul_serie_m4(obmat, tmat, locmat, - NULL, NULL, NULL, NULL, NULL, NULL); + mul_m4_m4m4(tmat, totmat, ob->parentinv); + mul_m4_m4m4(obmat, tmat, locmat); if (simul) { diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 10065910532..42d3b841799 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -86,7 +86,7 @@ void space_transform_from_matrixs(SpaceTransform *data, float local[4][4], float { float itarget[4][4]; invert_m4_m4(itarget, target); - mul_serie_m4(data->local2target, itarget, local, NULL, NULL, NULL, NULL, NULL, NULL); + mul_m4_m4m4(data->local2target, itarget, local); invert_m4_m4(data->target2local, data->local2target); } |