diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-06-09 15:35:11 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-06-18 10:25:43 +0300 |
| commit | 0a8eeae831cbdd2ec80f3741e56bafe27ac6feaa (patch) | |
| tree | e2553bd1ef809b85a781a956a095037ab4642ec2 /source | |
| parent | f649e5c418d931d750d9fbd45f63486ebc4be5e7 (diff) | |
Fix T72936: Incorrect gizmo orientation with inherit rotation disabled
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 */ |