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/editors/mesh/meshtools.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/editors/mesh/meshtools.c')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 5f451a542e6..48bd96251a6 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -341,7 +341,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) /* if this is the object we're merging into, no need to do anything */ if (base->object != ob) { /* watch this: switch matmul order really goes wrong */ - mult_m4_m4m4(cmat, imat, base->object->obmat); + mul_m4_m4m4(cmat, imat, base->object->obmat); /* transform vertex coordinates into new space */ for (a = 0, mv = mvert; a < me->totvert; a++, mv++) { |