Commit: c23b1de2cf8ad13f102d2d5484d09e280b36dda4
Author: Campbell Barton
Date: Tue Jun 9 22:35:11 2020 +1000
Branches: master
https://developer.blender.org/rBc23b1de2cf8ad13f102d2d5484d09e280b36dda4
Fix T72936: Incorrect gizmo orientation with inherit rotation disabled
===================================================================
M source/blender/editors/transform/transform_gizmo_3d.c
===================================================================
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c
b/source/blender/editors/transform/transform_gizmo_3d.c
index ebc021cd983..4c561037986 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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
