diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 05:58:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 06:02:13 +0300 |
| commit | dde4375d5c57ca3f138d2f925fa36d0b0e5895ea (patch) | |
| tree | fb2292b2e6c945bd816c2d00e7244cca965d4f5b /source/blender/draw/intern/draw_armature.c | |
| parent | 745311ed4c9ebdc410b60e558832ab22cb9106de (diff) | |
Fix T60504: Armature wire draw type hidden when unselected
Diffstat (limited to 'source/blender/draw/intern/draw_armature.c')
| -rw-r--r-- | source/blender/draw/intern/draw_armature.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index e5a15a9d01d..83212a594a9 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -742,8 +742,11 @@ static bool set_pchan_color(short colCode, const int boneflag, const short const /** See: 'set_pchan_color'*/ static void update_color(const Object *ob, const float const_color[4]) { + const bArmature *arm = ob->data; g_theme.const_color = const_color; - g_theme.const_wire = ((ob->base_flag & BASE_SELECTED) != 0) ? 1.5f : 0.0f; + g_theme.const_wire = ( + ((ob->base_flag & BASE_SELECTED) || + (arm->drawtype == ARM_WIRE)) ? 1.5f : 0.0f); #define NO_ALPHA(c) (((c)[3] = 1.0f), (c)) |