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_cast.c | |
| parent | e5b1f9c28d52254fd11e226ed4ac7bf07d7259d7 (diff) | |
| parent | 3311164b24da61f2967f96d0ee27508a7e2e0267 (diff) | |
svn merge ^/trunk/blender -r42669:42670
Diffstat (limited to 'source/blender/modifiers/intern/MOD_cast.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_cast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index f41dd1b8669..fa31018e0f6 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -159,7 +159,7 @@ static void sphere_do( if (ctrl_ob) { if(flag & MOD_CAST_USE_OB_TRANSFORM) { invert_m4_m4(ctrl_ob->imat, ctrl_ob->obmat); - mul_m4_m4m4(mat, ob->obmat, ctrl_ob->imat); + mult_m4_m4m4(mat, ctrl_ob->imat, ob->obmat); invert_m4_m4(imat, mat); } @@ -331,7 +331,7 @@ static void cuboid_do( if (ctrl_ob) { if(flag & MOD_CAST_USE_OB_TRANSFORM) { invert_m4_m4(ctrl_ob->imat, ctrl_ob->obmat); - mul_m4_m4m4(mat, ob->obmat, ctrl_ob->imat); + mult_m4_m4m4(mat, ctrl_ob->imat, ob->obmat); invert_m4_m4(imat, mat); } |