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/object.c | |
| parent | ce2e2b141e67e5be8cc85bc394dc6ca9e15f774b (diff) | |
replace mul_serie_m4 with mul_m4_m4m4 when only 3 args are given
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 15 |
1 files changed, 5 insertions, 10 deletions
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) { |