diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-16 23:53:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-16 23:53:12 +0400 |
| commit | 3311164b24da61f2967f96d0ee27508a7e2e0267 (patch) | |
| tree | 0824417cf3d645f59d98b210c02a4c5ef6c05a48 /source/blender/modifiers/intern/MOD_meshdeform.c | |
| parent | 3c8ab559a5bd31fd38e9c5cf9da8505ca28f4887 (diff) | |
Math lib: matrix multiplication order fix for two functions that were
inconsistent with similar functions & math notation:
mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B)
mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B)
For branch maintainers, it should be relatively simple to fix things manually,
it's also possible run this script after merging to do automatic replacement:
http://www.pasteall.org/27459/python
Diffstat (limited to 'source/blender/modifiers/intern/MOD_meshdeform.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshdeform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index bcbb6c630a6..e6e2c0fd621 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -223,8 +223,8 @@ static void meshdeformModifier_do( /* compute matrices to go in and out of cage object space */ invert_m4_m4(imat, mmd->object->obmat); - mul_m4_m4m4(cagemat, ob->obmat, imat); - mul_m4_m4m4(cmat, cagemat, mmd->bindmat); + mult_m4_m4m4(cagemat, imat, ob->obmat); + mult_m4_m4m4(cmat, mmd->bindmat, cagemat); invert_m4_m4(iobmat, cmat); copy_m3_m4(icagemat, iobmat); |