blender
/
blender
136
406
Fork 590
Code Issues 6.3k Pull Requests 761 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-04-17 20:24:03 +10:00
parent 40d90456ea adc6659de5
commit 493c623b13
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/draw/engines/overlay/overlay_armature.c
View File

@ -1341,8 +1341,8 @@ static void draw_points(ArmatureDrawContext *ctx,
bone_hint_color_shade(col_hint_tail, (ctx->const_color) ? col_solid_tail : col_wire_tail);
/* Draw root point if we are not connected to our parent */
if (!(eBone ? (eBone->parent && (eBone->flag & BONE_CONNECTED)) :
(pchan->bone->parent && (pchan->bone->flag & BONE_CONNECTED)))) {
if (!(eBone ? (eBone->parent && (boneflag & BONE_CONNECTED)) :
(pchan->bone->parent && (boneflag & BONE_CONNECTED)))) {
if (select_id != -1) {
DRW_select_load_id(select_id | BONESEL_ROOT);
}
@ -1522,8 +1522,8 @@ static void draw_bone_line(ArmatureDrawContext *ctx,
}
/* Draw root point if we are not connected to our parent. */
if (!(eBone ? (eBone->parent && (eBone->flag & BONE_CONNECTED)) :
(pchan->bone->parent && (pchan->bone->flag & BONE_CONNECTED)))) {
if (!(eBone ? (eBone->parent && (boneflag & BONE_CONNECTED)) :
(pchan->bone->parent && (boneflag & BONE_CONNECTED)))) {
if (eBone) {
col_head = (eBone->flag & BONE_ROOTSEL) ? G_draw.block.colorVertexSelect : col_bone;