From 0a8eeae831cbdd2ec80f3741e56bafe27ac6feaa Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 9 Jun 2020 22:35:11 +1000 Subject: Fix T72936: Incorrect gizmo orientation with inherit rotation disabled --- source/blender/editors/transform/transform_gizmo_3d.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index d7461e1de0c..cbb20847f36 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -595,7 +595,9 @@ bool gimbal_axis(Object *ob, float gmat[3][3]) if (pchan->parent) { float parent_mat[3][3]; - copy_m3_m4(parent_mat, pchan->parent->pose_mat); + copy_m3_m4(parent_mat, + (pchan->bone->flag & BONE_HINGE) ? pchan->parent->bone->arm_mat : + pchan->parent->pose_mat); mul_m3_m3m3(mat, parent_mat, tmat); /* needed if object transformation isn't identity */ -- cgit v1.2.3