[Bf-blender-cvs] [5c728358ec2] blender2.8: Armature: Remove big outlines for active bones & reduce axes color.

Clément Foucault noreply at git.blender.org
Mon May 7 13:08:29 CEST 2018


Commit: 5c728358ec25e18ebc5a11e64956eb620a7703a8
Author: Clément Foucault
Date:   Mon May 7 12:23:15 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5c728358ec25e18ebc5a11e64956eb620a7703a8

Armature: Remove big outlines for active bones & reduce axes color.

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

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 38c618479c7..9c05f3165df 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -732,9 +732,7 @@ static float get_bone_wire_thickness(int boneflag)
 {
 	if (g_theme.const_color)
 		return g_theme.const_wire;
-	else if (boneflag & BONE_DRAW_ACTIVE)
-		return 3.0f;
-	else if (boneflag & BONE_SELECTED)
+	else if (boneflag & (BONE_DRAW_ACTIVE | BONE_SELECTED))
 		return 2.0f;
 	else
 		return 1.0f;
@@ -1030,7 +1028,7 @@ static void draw_axes(EditBone *eBone, bPoseChannel *pchan)
 	const float *col = (g_theme.const_color) ? g_theme.const_color :
 	                   (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? g_theme.text_hi_color : g_theme.text_color;
 	copy_v4_v4(final_col, col);
-	final_col[3] = (g_theme.const_color) ? 1.0 : 0.3; /* Mix with axes color. */
+	final_col[3] = (g_theme.const_color) ? 1.0 : 0.4; /* Mix with axes color. */
 	drw_shgroup_bone_axes(BONE_VAR(eBone, pchan, disp_mat), final_col);
 }



More information about the Bf-blender-cvs mailing list