archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix warp modifier using pose matrix without object matrix applied

Browse Source 
Error in recent patch D6820
This commit is contained in:
Cody Winchester
2020-03-29 18:56:59 +11:00
committed by Campbell Barton
parent b9faf53182
commit e8dd6128b5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_warp.c
View File

@@ -90,7 +90,9 @@ static void matrix_from_obj_pchan(float mat[4][4], float obinv[4][4], Object *ob
{
bPoseChannel *pchan = BKE_pose_channel_find_name(ob->pose, bonename);
if (pchan) {
mul_m4_m4m4(mat, obinv, pchan->pose_mat);
float mat_bone_world[4][4];
mul_m4_m4m4(mat_bone_world, ob->obmat, pchan->pose_mat);
mul_m4_m4m4(mat, obinv, mat_bone_world);
}
else {
mul_m4_m4m4(mat, obinv, ob->obmat);