[Bf-blender-cvs] [0a8eeae831c] blender-v2.83-release: Fix T72936: Incorrect gizmo orientation with inherit rotation disabled
Campbell Barton
noreply at git.blender.org
Thu Jun 18 10:15:24 CEST 2020
Commit: 0a8eeae831cbdd2ec80f3741e56bafe27ac6feaa
Author: Campbell Barton
Date: Tue Jun 9 22:35:11 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB0a8eeae831cbdd2ec80f3741e56bafe27ac6feaa
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 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 */
More information about the Bf-blender-cvs
mailing list