diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
commit | db6cb30941da7899ccafa44c87c17970d134a2c9 (patch) | |
tree | 0f1c3df62346cfac61e2785e9ec7ac8e0e30f443 /source/blender/modifiers/intern/MOD_warp.c | |
parent | e5b1f9c28d52254fd11e226ed4ac7bf07d7259d7 (diff) | |
parent | 3311164b24da61f2967f96d0ee27508a7e2e0267 (diff) |
svn merge ^/trunk/blender -r42669:42670
Diffstat (limited to 'source/blender/modifiers/intern/MOD_warp.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_warp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index d86e746abbc..5961fae1aba 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -197,11 +197,11 @@ static void warpModifier_do(WarpModifierData *wmd, Object *ob, invert_m4_m4(obinv, ob->obmat); - mul_m4_m4m4(mat_from, wmd->object_from->obmat, obinv); - mul_m4_m4m4(mat_to, wmd->object_to->obmat, obinv); + mult_m4_m4m4(mat_from, obinv, wmd->object_from->obmat); + mult_m4_m4m4(mat_to, obinv, wmd->object_to->obmat); invert_m4_m4(tmat, mat_from); // swap? - mul_m4_m4m4(mat_final, mat_to, tmat); + mult_m4_m4m4(mat_final, tmat, mat_to); invert_m4_m4(mat_from_inv, mat_from); |