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/collada_utils.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/collada_utils.cpp')
-rw-r--r--source/blender/collada/collada_utils.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 66cef6dd20a..65d6a13dd18 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -102,7 +102,7 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space)
BKE_object_where_is_calc(sce, par);
// move child obmat into world space
- mult_m4_m4m4(mat, par->obmat, ob->obmat);
+ mul_m4_m4m4(mat, par->obmat, ob->obmat);
copy_m4_m4(ob->obmat, mat);
}
@@ -376,8 +376,8 @@ void bc_match_scale(std::vector<Object *> *objects_done,
++it)
{
ob = *it;
- mult_m4_m4m4(ob->obmat, size_mat4, ob->obmat);
- mult_m4_m4m4(ob->obmat, bc_unit.get_rotation(), ob->obmat);
+ mul_m4_m4m4(ob->obmat, size_mat4, ob->obmat);
+ mul_m4_m4m4(ob->obmat, bc_unit.get_rotation(), ob->obmat);
BKE_object_apply_mat4(ob, ob->obmat, 0, 0);
}