diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-14 22:04:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-14 22:04:52 +0300 |
| commit | 1d5ba269c1f6b232f1ec83e77e6e8fe07d5c5d1f (patch) | |
| tree | 327dc2edb006468113e185b4946ab4c3b434d68b /source/blender/editors/space_view3d/drawarmature.c | |
| parent | 0f13f5a683ec9b8d024feaec5ba2ede193a618f0 (diff) | |
| parent | f13c729b26befae8709a8e565a27d6fd31101d44 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/drawarmature.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 3cb83546a44..d61058744d0 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1449,7 +1449,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_color(PCHAN_COLOR_CONSTS, boneflag, constflag)) { glEnable(GL_BLEND); @@ -1604,7 +1604,7 @@ static void draw_bone(const short dt, int armflag, int boneflag, short constflag set_ebone_color(boneflag); } else if (armflag & ARM_POSEMODE) { - if (constflag) { + if (constflag && ((G.f & G_PICKSEL) == 0)) { /* draw constraint colors */ if (set_pchan_color(PCHAN_COLOR_CONSTS, boneflag, constflag)) { glEnable(GL_BLEND); |