[Bf-blender-cvs] [42e336728d8] blender2.8: Fix custom-bone display-at option

Campbell Barton noreply at git.blender.org
Thu Jun 1 05:54:59 CEST 2017


Commit: 42e336728d8520c6abc0013a2880bcbda657e8e0
Author: Campbell Barton
Date:   Thu Jun 1 13:54:29 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB42e336728d8520c6abc0013a2880bcbda657e8e0

Fix custom-bone display-at option

===================================================================

M	source/blender/draw/intern/draw_armature.c

===================================================================

diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 110dc3c7fcf..bbb22ad2548 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -903,7 +903,7 @@ static void draw_bone_update_disp_matrix_custom(bPoseChannel *pchan)
 
 	/* See TODO above */
 	length = PCHAN_CUSTOM_DRAW_SIZE(pchan);
-	bone_mat = pchan->pose_mat;
+	bone_mat = pchan->custom_tx ? pchan->custom_tx->pose_mat : pchan->pose_mat;
 	disp_mat = pchan->disp_mat;
 	disp_tail_mat = pchan->disp_tail_mat;
 
@@ -1036,7 +1036,7 @@ static void draw_bone_custom_shape(
 {
 	const float *col_solid = get_bone_solid_color(eBone, pchan, arm, boneflag, constflag);
 	const float *col_wire = get_bone_wire_color(eBone, pchan, arm, boneflag, constflag);
-	const float (*disp_mat)[4] = pchan->custom_tx ? pchan->custom_tx->disp_mat : pchan->disp_mat;
+	const float (*disp_mat)[4] = pchan->disp_mat;
 
 	if (select_id != -1) {
 		DRW_select_load_id(select_id | BONESEL_BONE);




More information about the Bf-blender-cvs mailing list