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

source/blender/editors/space_view3d/drawobject.c

index 8b1f44557e4229e4698e017d7b6a7cdadce471cf..799fb6d501886b6dc327e3118c7bec634a46c3bb 100644 (file)
@@ -8434,7 +8434,7 @@ void draw_object_wire_color(Scene *scene, SceneLayer *sl, Base *base, unsigned c
                                        theme_id = TH_GROUP_ACTIVE;
 
                                        if (sl->basact != base) {
-                                               theme_shade = -16;
+                                               theme_shade = -32;
                                        }
                                }
                                else {