[Bf-blender-cvs] [dde4375d5c5] master: Fix T60504: Armature wire draw type hidden when unselected

[Campbell Barton]

Commit: dde4375d5c57ca3f138d2f925fa36d0b0e5895ea
Author: Campbell Barton
Date:   Tue Jan 15 13:58:40 2019 +1100
Branches: master
https://developer.blender.org/rBdde4375d5c57ca3f138d2f925fa36d0b0e5895ea

Fix T60504: Armature wire draw type hidden when unselected

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

M       source/blender/draw/intern/draw_armature.c

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

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))

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs