Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Mar 2017 19:04:52 +0000 (06:04 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Mar 2017 19:04:52 +0000 (06:04 +1100)
1  2 
source/blender/blenkernel/intern/mesh.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/util/undo.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c

index 3cb83546a443306adeaccf512d2557fc181accf3,47a19bc83cce0ce187f175274c104627e0982eb1..d61058744d0edfe6076c571a96d37d26c9fd37ab
@@@ -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();
Simple merge
Simple merge