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_screw.c | |
parent | e5b1f9c28d52254fd11e226ed4ac7bf07d7259d7 (diff) | |
parent | 3311164b24da61f2967f96d0ee27508a7e2e0267 (diff) |
svn merge ^/trunk/blender -r42669:42670
Diffstat (limited to 'source/blender/modifiers/intern/MOD_screw.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 3ab80aecfca..e76c568b86d 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -197,7 +197,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* calc the matrix relative to the axis object */ invert_m4_m4(mtx_tmp_a, ob->obmat); copy_m4_m4(mtx_tx_inv, ltmd->ob_axis->obmat); - mul_m4_m4m4(mtx_tx, mtx_tx_inv, mtx_tmp_a); + mult_m4_m4m4(mtx_tx, mtx_tmp_a, mtx_tx_inv); /* calc the axis vec */ mul_mat3_m4_v3(mtx_tx, axis_vec); /* only rotation component */ |