Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-06-01 06:54:29 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-06-01 06:54:29 +0300
commit42e336728d8520c6abc0013a2880bcbda657e8e0 (patch)
treeda0bc55bf8e4c0000a27f6f35b39b46d61df625c /source/blender/draw/intern/draw_armature.c
parenta5783d08f9d859260afc46ea0c86e91972b36efa (diff)
Fix custom-bone display-at option
Diffstat (limited to 'source/blender/draw/intern/draw_armature.c')
-rw-r--r--source/blender/draw/intern/draw_armature.c4
1 files changed, 2 insertions, 2 deletions
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);