diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
| commit | db6cb30941da7899ccafa44c87c17970d134a2c9 (patch) | |
| tree | 0f1c3df62346cfac61e2785e9ec7ac8e0e30f443 /source/blender/modifiers/intern/MOD_boolean_util.c | |
| parent | e5b1f9c28d52254fd11e226ed4ac7bf07d7259d7 (diff) | |
| parent | 3311164b24da61f2967f96d0ee27508a7e2e0267 (diff) | |
svn merge ^/trunk/blender -r42669:42670
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean_util.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c index d83fa0f6c2d..dfa220ba432 100644 --- a/source/blender/modifiers/intern/MOD_boolean_util.c +++ b/source/blender/modifiers/intern/MOD_boolean_util.c @@ -478,7 +478,7 @@ static DerivedMesh *NewBooleanDerivedMesh_intern( // we need to compute the inverse transform from global to ob (inv_mat), // and the transform from ob to ob_select for use in interpolation (map_mat) invert_m4_m4(inv_mat, ob->obmat); - mul_m4_m4m4(map_mat, ob_select->obmat, inv_mat); + mult_m4_m4m4(map_mat, inv_mat, ob_select->obmat); invert_m4_m4(inv_mat, ob_select->obmat); { |