From ec8d277c64346770b99716b3c1bbdcd07eae26f6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 26 May 2013 18:36:25 +0000 Subject: 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. --- source/blender/collada/AnimationExporter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/collada/AnimationExporter.cpp') diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 3cd0efe6978..19a49c4344d 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -958,7 +958,7 @@ std::string AnimationExporter::create_4x4_source(std::vector &frames, Obj // compute bone local mat if (bone->parent) { invert_m4_m4(ipar, parchan->pose_mat); - mult_m4_m4m4(mat, ipar, pchan->pose_mat); + mul_m4_m4m4(mat, ipar, pchan->pose_mat); } else copy_m4_m4(mat, pchan->pose_mat); @@ -972,13 +972,13 @@ std::string AnimationExporter::create_4x4_source(std::vector &frames, Obj temp[3][0] = temp[3][1] = temp[3][2] = 0.0f; invert_m4(temp); - mult_m4_m4m4(mat, mat, temp); + mul_m4_m4m4(mat, mat, temp); if (bone->parent) { copy_m4_m4(temp, bone->parent->arm_mat); temp[3][0] = temp[3][1] = temp[3][2] = 0.0f; - mult_m4_m4m4(mat, temp, mat); + mul_m4_m4m4(mat, temp, mat); } } @@ -1497,7 +1497,7 @@ void AnimationExporter::sample_animation(float *v, std::vector &frames, i // compute bone local mat if (bone->parent) { invert_m4_m4(ipar, parchan->pose_mat); - mult_m4_m4m4(mat, ipar, pchan->pose_mat); + mul_m4_m4m4(mat, ipar, pchan->pose_mat); } else copy_m4_m4(mat, pchan->pose_mat); -- cgit v1.2.3