Commit: f3764d51bd79a5b1eb7ea512817820da9d5150c5
Author: Bastien Montagne
Date: Wed Jul 5 09:20:48 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBf3764d51bd79a5b1eb7ea512817820da9d5150c5
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_view3d/drawobject.c
===================================================================
===================================================================
diff --cc source/blender/editors/space_view3d/drawobject.c
index 8b1f44557e4,3f11703973d..799fb6d5018
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -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 {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
