diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-12 12:52:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-12 12:56:26 +0300 |
| commit | 3394f7c74b8c38980885d40e41005115e878352f (patch) | |
| tree | 827ba150d8a2a9ddb170591d7e2188b0a1dcc6fc /source/blender/draw/intern/draw_armature.c | |
| parent | c20c203b82260c06888c2a535c08ec383923ee8a (diff) | |
Fix again DwM bbones drawing.
Stupid mistake in rB6824ee0595c9dd7d1c18864f2 fix, again reported by
@campbellbarton, thanks.
Diffstat (limited to 'source/blender/draw/intern/draw_armature.c')
| -rw-r--r-- | source/blender/draw/intern/draw_armature.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index 68104dafc07..720740ef84b 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -753,7 +753,6 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc float s[4][4], ebmat[4][4]; float length, xwidth, zwidth; float (*bone_mat)[4]; - float (*disp_mat)[4]; short bbone_segments; /* TODO : This should be moved to depsgraph or armature refresh @@ -764,7 +763,6 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc xwidth = pchan->bone->xwidth; zwidth = pchan->bone->zwidth; bone_mat = pchan->pose_mat; - disp_mat = pchan->disp_mat; bbone_segments = pchan->bone->segments; } else { @@ -775,7 +773,6 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc xwidth = eBone->xwidth; zwidth = eBone->zwidth; bone_mat = ebmat; - disp_mat = eBone->disp_mat; bbone_segments = eBone->segments; } @@ -791,7 +788,7 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc for (int i = bbone_segments; i--; bbones_mat++) { mul_m4_m4m4(bbones_mat->mat, bbones_mat->mat, s); - mul_m4_m4m4(bbones_mat->mat, disp_mat, bbones_mat->mat); + mul_m4_m4m4(bbones_mat->mat, bone_mat, bbones_mat->mat); } } else { @@ -806,7 +803,7 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc for (int i = bbone_segments; i--; bbones_mat++) { mul_m4_m4m4(*bbones_mat, *bbones_mat, s); - mul_m4_m4m4(*bbones_mat, disp_mat, *bbones_mat); + mul_m4_m4m4(*bbones_mat, bone_mat, *bbones_mat); } } else { |