diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
| commit | ec8d277c64346770b99716b3c1bbdcd07eae26f6 (patch) | |
| tree | e0fc551f658e2585d0ea1c36b8d3e2c373919ef2 /source/blender/modifiers/intern/MOD_array.c | |
| parent | 4cf069a41d0a3c39a39237656cd7e65be1d37924 (diff) | |
BLI_math rename functions:
- mult_m4_m4m4 -> mul_m4_m4m4
- mult_m3_m3m4 -> mul_m3_m3m4
these temporary names were used to avoid problems when argument order was switched.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_array.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 4 |
1 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 5e90aa10294..a1fdae5792c 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -418,7 +418,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, for (j = 0; j < count - 1; j++) { float tmp_mat[4][4]; - mult_m4_m4m4(tmp_mat, offset, final_offset); + mul_m4_m4m4(tmp_mat, offset, final_offset); copy_m4_m4(final_offset, tmp_mat); } @@ -539,7 +539,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, if (end_cap) { float endoffset[4][4]; - mult_m4_m4m4(endoffset, offset, final_offset); + mul_m4_m4m4(endoffset, offset, final_offset); bm_merge_dm_transform(bm, end_cap, endoffset, amd, &dupe_op, (count == 1) ? dupe_op.slots_in : dupe_op.slots_out, (count == 1) ? "geom" : "geom.out", &weld_op); |