Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Jul 2017 07:20:48 +0000 (09:20 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 5 Jul 2017 07:20:48 +0000 (09:20 +0200)
Conflicts:
source/blender/editors/space_view3d/drawobject.c

1  2 
source/blender/editors/space_view3d/drawobject.c

index 8b1f44557e4229e4698e017d7b6a7cdadce471cf,3f11703973dda1a6f01cdce7cd9f3ac51f7c6151..799fb6d501886b6dc327e3118c7bec634a46c3bb
@@@ -8433,8 -7346,8 +8433,8 @@@ void draw_object_wire_color(Scene *scen
                                        /* uses darker active color for non-active + selected */
                                        theme_id = TH_GROUP_ACTIVE;
  
 -                                      if (scene->basact != base) {
 +                                      if (sl->basact != base) {
-                                               theme_shade = -16;
+                                               theme_shade = -32;
                                        }
                                }
                                else {