Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-05-26 22:36:25 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-26 22:36:25 +0400
commitec8d277c64346770b99716b3c1bbdcd07eae26f6 (patch)
treee0fc551f658e2585d0ea1c36b8d3e2c373919ef2 /source/blender/collada/AnimationExporter.cpp
parent4cf069a41d0a3c39a39237656cd7e65be1d37924 (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/collada/AnimationExporter.cpp')
-rw-r--r--source/blender/collada/AnimationExporter.cpp8
1 files changed, 4 insertions, 4 deletions
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<float> &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<float> &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<float> &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);