diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-07-21 12:55:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-21 12:57:35 +0400 |
commit | 8489b94e07f9e73bd3c9c3e4f6a91f1f0a259827 (patch) | |
tree | c19fb4ce9919c44876fee88c143ead4722603ca5 /source/blender/modifiers | |
parent | 1fdaf5862feab049d6e8e60cd5f1469a17b9cda5 (diff) |
Math Lib: rename mul_serie_m3 to mul_m3_series & reorder args
Importantly, reversed mul_serie_m3 argument order (so it matches the m4 function)
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_hook.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 9ae12550cb7..085834de602 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -370,7 +370,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, else unit_m4(obinv); - mul_serie_m4(result_mat, offset, + mul_m4_series(result_mat, offset, obinv, amd->offset_ob->obmat); copy_m4_m4(offset, result_mat); } diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index db37201dacb..f6d7c03df32 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -156,7 +156,7 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm, copy_m4_m4(dmat, hmd->object->obmat); } invert_m4_m4(ob->imat, ob->obmat); - mul_serie_m4(mat, ob->imat, dmat, hmd->parentinv); + mul_m4_series(mat, ob->imat, dmat, hmd->parentinv); modifier_get_vgroup(ob, dm, hmd->name, &dvert, &defgrp_index); max_dvert = (dvert) ? numVerts : 0; |