diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-11 06:22:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-11 07:02:52 +0300 |
| commit | 932701379692866394e196acd12a7157b5beba0d (patch) | |
| tree | 82a5b787989ebeb116b7dd9ee354bc60b6557e39 /source/blender/draw/intern/draw_common.c | |
| parent | ee6e02ccf38dd88204fed0adc573466a77924321 (diff) | |
3D View: use faded wire for set-scene objects
Matches 2.7x behavior.
Diffstat (limited to 'source/blender/draw/intern/draw_common.c')
| -rw-r--r-- | source/blender/draw/intern/draw_common.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |