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_hook.c | |
parent | e5b1f9c28d52254fd11e226ed4ac7bf07d7259d7 (diff) | |
parent | 3311164b24da61f2967f96d0ee27508a7e2e0267 (diff) |
svn merge ^/trunk/blender -r42669:42670
Diffstat (limited to 'source/blender/modifiers/intern/MOD_hook.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_hook.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index d7546b11303..ecacbe4a332 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -157,7 +157,7 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm, /* get world-space matrix of target, corrected for the space the verts are in */ if (hmd->subtarget[0] && pchan) { /* bone target if there's a matching pose-channel */ - mul_m4_m4m4(dmat, pchan->pose_mat, hmd->object->obmat); + mult_m4_m4m4(dmat, hmd->object->obmat, pchan->pose_mat); } else { /* just object target */ |