[Bf-blender-cvs] [adc6659de5d] blender-v2.83-release: Fix T75820: Child bone head vanishes when connected parent is hidden
Campbell Barton
noreply at git.blender.org
Fri Apr 17 12:23:44 CEST 2020
Commit: adc6659de5d90bbed360e243e4c0a8b65a6754eb
Author: Campbell Barton
Date: Fri Apr 17 20:21:25 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rBadc6659de5d90bbed360e243e4c0a8b65a6754eb
Fix T75820: Child bone head vanishes when connected parent is hidden
===================================================================
M source/blender/draw/engines/overlay/overlay_armature.c
===================================================================
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index 49dece13869..bbcfcaf777d 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -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;
More information about the Bf-blender-cvs
mailing list