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>2020-04-17 13:24:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-04-17 13:24:03 +0300
commit493c623b13e8496f99aeb0ca6c7f3799e1039c98 (patch)
treee967e452fcce0c8a7bed6db77d7591ba67149e8f
parent40d90456eaa0c85ad3e738a03f2c223cb66bf966 (diff)
parentadc6659de5d90bbed360e243e4c0a8b65a6754eb (diff)
Merge branch 'blender-v2.83-release'
-rw-r--r--source/blender/draw/engines/overlay/overlay_armature.c8
1 files changed, 4 insertions, 4 deletions
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;