From 21bed44001a8e81e8278a46ec985a2b8660184ca Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Wed, 12 May 2021 12:55:47 +0200 Subject: Fix custom bone shape scale affecting normal bone display Also some clang-format changes. --- source/blender/draw/engines/overlay/overlay_armature.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'source/blender/draw/engines') diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index e4072879adc..acda07d7841 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -1043,7 +1043,7 @@ static void draw_bone_update_disp_matrix_default(EditBone *eBone, bPoseChannel * bone_mat = pchan->pose_mat; disp_mat = pchan->disp_mat; disp_tail_mat = pchan->disp_tail_mat; - mul_v3_v3fl(bone_scale, pchan->custom_scale_xyz, pchan->bone->length); + copy_v3_fl(bone_scale, pchan->bone->length); } else { eBone->length = len_v3v3(eBone->tail, eBone->head); @@ -1271,9 +1271,9 @@ static void draw_bone_update_disp_matrix_custom(bPoseChannel *pchan) copy_m4_m4(disp_mat, bone_mat); translate_m4(disp_mat, - pchan->custom_translation[0], - pchan->custom_translation[1], - pchan->custom_translation[2]); + pchan->custom_translation[0], + pchan->custom_translation[1], + pchan->custom_translation[2]); mul_m4_m4m3(disp_mat, disp_mat, rot_mat); rescale_m4(disp_mat, bone_scale); copy_m4_m4(disp_tail_mat, disp_mat); @@ -1286,10 +1286,9 @@ static void draw_axes(ArmatureDrawContext *ctx, const bArmature *arm) { float final_col[4]; - const float *col = (ctx->const_color) ? - ctx->const_color : - (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.colorTextHi : - G_draw.block.colorText; + const float *col = (ctx->const_color) ? ctx->const_color : + (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.colorTextHi : + G_draw.block.colorText; copy_v4_v4(final_col, col); /* Mix with axes color. */ final_col[3] = (ctx->const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? 0.1 : 0.65; -- cgit v1.2.3