diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-16 23:53:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-16 23:53:12 +0400 |
| commit | 3311164b24da61f2967f96d0ee27508a7e2e0267 (patch) | |
| tree | 0824417cf3d645f59d98b210c02a4c5ef6c05a48 /source/blender/editors/mesh/meshtools.c | |
| parent | 3c8ab559a5bd31fd38e9c5cf9da8505ca28f4887 (diff) | |
Math lib: matrix multiplication order fix for two functions that were
inconsistent with similar functions & math notation:
mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B)
mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B)
For branch maintainers, it should be relatively simple to fix things manually,
it's also possible run this script after merging to do automatic replacement:
http://www.pasteall.org/27459/python
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 1022d247d68..dd82f055f14 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -327,7 +327,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 */ - mul_m4_m4m4(cmat, base->object->obmat, imat); + mult_m4_m4m4(cmat, imat, base->object->obmat); /* transform vertex coordinates into new space */ for(a=0, mv=mvert; a < me->totvert; a++, mv++) { |