[Bf-blender-cvs] [93270137969] master: 3D View: use faded wire for set-scene objects

[Campbell Barton]

Commit: 932701379692866394e196acd12a7157b5beba0d
Author: Campbell Barton
Date:   Fri Jan 11 14:22:40 2019 +1100
Branches: master
https://developer.blender.org/rB932701379692866394e196acd12a7157b5beba0d

3D View: use faded wire for set-scene objects

Matches 2.7x behavior.

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

M	source/blender/draw/intern/draw_common.c
M	source/blender/draw/modes/object_mode.c
M	source/blender/draw/modes/overlay_mode.c

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

diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 113149b0e60..ce7667f3ef0 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -905,7 +905,10 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color
 	}
 
 	if (r_color != NULL) {
-		if (UNLIKELY(ob->base_flag & BASE_FROMDUPLI)) {
+		if (UNLIKELY(ob->base_flag & BASE_FROM_SET)) {
+			*r_color = ts.colorDupli;
+		}
+		else if (UNLIKELY(ob->base_flag & BASE_FROMDUPLI)) {
 			switch (theme_id) {
 				case TH_ACTIVE:
 				case TH_SELECT:       *r_color = ts.colorDupliSelect; break;
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index fef34300a76..69de0d72fb9 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -828,7 +828,10 @@ static DRWShadingGroup *shgroup_theme_id_to_outline_or_null(
 static DRWShadingGroup *shgroup_theme_id_to_wire(
         OBJECT_ShadingGroupList *sgl, int theme_id, const short base_flag)
 {
-	if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
+	if (UNLIKELY(base_flag & BASE_FROM_SET)) {
+		return sgl->wire_dupli;
+	}
+	else if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
 		switch (theme_id) {
 			case TH_ACTIVE:
 			case TH_SELECT:
@@ -855,7 +858,10 @@ static DRWShadingGroup *shgroup_theme_id_to_wire(
 static DRWShadingGroup *shgroup_theme_id_to_point(
         OBJECT_ShadingGroupList *sgl, int theme_id, const short base_flag)
 {
-	if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
+	if (UNLIKELY(base_flag & BASE_FROM_SET)) {
+		return sgl->points_dupli;
+	}
+	else if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
 		switch (theme_id) {
 			case TH_ACTIVE:
 			case TH_SELECT:
diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index 0c3497121c2..dd8f580a8c3 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -248,7 +248,11 @@ static void overlay_cache_populate(void *vedata, Object *ob)
 
 			const float *rim_col = NULL;
 			const float *wire_col = NULL;
-			if (UNLIKELY(ob->base_flag & BASE_FROMDUPLI)) {
+			if (UNLIKELY(ob->base_flag & BASE_FROM_SET)) {
+				rim_col = ts.colorDupli;
+				wire_col = ts.colorDupli;
+			}
+			else if (UNLIKELY(ob->base_flag & BASE_FROMDUPLI)) {
 				if (ob->base_flag & BASE_SELECTED) {
 					if (G.moving & G_TRANSFORM_OBJ) {
 						rim_col = ts.colorTransform;