diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-07-20 08:01:42 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-20 08:01:42 +0400 |
commit | 7c7b7302d33b9a43f5436589a726bc733be91a33 (patch) | |
tree | f7151512b3ba95ead50f991daf1ec29ca5b7f811 /source/blender/modifiers | |
parent | 3ca78a40e8b9eb7fa7c01404590ca2592a0b390d (diff) |
Math Lib: use variable length args for mul_serie_m3,m4 (instead of trailing NULL's)
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 3 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_hook.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 0a4a6140c02..9ae12550cb7 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -371,8 +371,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, unit_m4(obinv); mul_serie_m4(result_mat, offset, - obinv, amd->offset_ob->obmat, - NULL, NULL, NULL, NULL, NULL); + 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 c89bc8c1d41..db37201dacb 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -156,8 +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, - NULL, NULL, NULL, NULL, NULL); + mul_serie_m4(mat, ob->imat, dmat, hmd->parentinv); modifier_get_vgroup(ob, dm, hmd->name, &dvert, &defgrp_index); max_dvert = (dvert) ? numVerts : 0; |