[Bf-blender-cvs] [810982a95c9] master: Fix T50932: depth picking w/ pose-bone constraints
Campbell Barton
noreply at git.blender.org
Tue Mar 14 07:58:07 CET 2017
Commit: 810982a95c950610fe10b6d17f919c8eed91782f
Author: Campbell Barton
Date: Tue Mar 14 18:01:04 2017 +1100
Branches: master
https://developer.blender.org/rB810982a95c950610fe10b6d17f919c8eed91782f
Fix T50932: depth picking w/ pose-bone constraints
===================================================================
M source/blender/editors/space_view3d/drawarmature.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 149144d969a..47a19bc83cc 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -1265,7 +1265,7 @@ static void draw_b_bone(const short dt, int armflag, int boneflag, short constfl
else {
/* wire */
if (armflag & ARM_POSEMODE) {
- if (constflag) {
+ if (constflag && ((G.f & G_PICKSEL) == 0)) {
/* set constraint colors */
if (set_pchan_glColor(PCHAN_COLOR_CONSTS, boneflag, constflag)) {
glEnable(GL_BLEND);
@@ -1406,7 +1406,7 @@ static void draw_bone(const short dt, int armflag, int boneflag, short constflag
set_ebone_glColor(boneflag);
}
else if (armflag & ARM_POSEMODE) {
- if (constflag) {
+ if (constflag && ((G.f & G_PICKSEL) == 0)) {
/* draw constraint colors */
if (set_pchan_glColor(PCHAN_COLOR_CONSTS, boneflag, constflag)) {
glEnable(GL_BLEND);
More information about the Bf-blender-cvs
mailing list