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/TransformWriter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/collada/TransformWriter.cpp') diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index c530135bc4d..efefca86d3e 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -40,7 +40,7 @@ void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[4][4], if (parent_mat) { float invpar[4][4]; invert_m4_m4(invpar, parent_mat); - mult_m4_m4m4(local, invpar, mat); + mul_m4_m4m4(local, invpar, mat); } else { copy_m4_m4(local, mat); @@ -82,7 +82,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B // calculate local mat invert_m4_m4(imat, ob->parent->obmat); - mult_m4_m4m4(mat, imat, tmat); + mul_m4_m4m4(mat, imat, tmat); // done -- cgit v1.2.3