[Bf-blender-cvs] [1d5ba269c1] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 1d5ba269c1f6b232f1ec83e77e6e8fe07d5c5d1f
Author: Campbell Barton
Date:   Wed Mar 15 06:04:52 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB1d5ba269c1f6b232f1ec83e77e6e8fe07d5c5d1f

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/space_view3d/drawarmature.c
index 3cb83546a4,47a19bc83c..d61058744d
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@@ -1449,12 -1265,11 +1449,12 @@@ static void draw_b_bone(const short dt
  	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)) {
 +				if (set_pchan_color(PCHAN_COLOR_CONSTS, boneflag, constflag)) {
  					glEnable(GL_BLEND);
  					
 +					flat_color = true;
  					draw_b_bone_boxes(OB_SOLID, pchan, ebone, xwidth, length, zwidth);
  					
  					glDisable(GL_BLEND);
@@@ -1601,12 -1403,12 +1601,12 @@@ static void draw_bone(const short dt, i
  	if (dt <= OB_WIRE) {
  		/* colors */
  		if (armflag & ARM_EDITMODE) {
 -			set_ebone_glColor(boneflag);
 +			set_ebone_color(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)) {
 +				if (set_pchan_color(PCHAN_COLOR_CONSTS, boneflag, constflag)) {
  					glEnable(GL_BLEND);
  					
  					draw_bone_solid_octahedral();