bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix T60504: Armature wire draw type hidden when unselected

Browse Source
This commit is contained in:
Campbell Barton 2019-01-15 13:58:40 +11:00
parent 745311ed4c
commit dde4375d5c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/intern/draw_armature.c
View File

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