[Bf-blender-cvs] [5ed702dc9cb] blender2.8: Armature: Fix T55068: Wireframe bones with custom shapes not working in object mode

[Clément Foucault]

Commit: 5ed702dc9cbd94d592b1997e6bd35d5b6e7a639f
Author: Clément Foucault
Date:   Wed May 16 18:40:25 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5ed702dc9cbd94d592b1997e6bd35d5b6e7a639f

Armature: Fix T55068: Wireframe bones with custom shapes not working in object mode

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

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 b4c4b010b08..abf0a54d95b 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -331,9 +331,11 @@ static void drw_shgroup_bone_custom_wire(const float (*bone_mat)[4], const float
 	struct Gwn_Batch *geom = DRW_cache_object_wire_outline_get(custom);
 	if (geom) {
 		DRWShadingGroup *shgrp_geom_wire = shgroup_instance_wire(g_data.passes.bone_wire, geom);
-		float final_bonemat[4][4];
+		float final_bonemat[4][4], final_color[4];
 		mul_m4_m4m4(final_bonemat, g_data.ob->obmat, bone_mat);
-		DRW_shgroup_call_dynamic_add(shgrp_geom_wire, final_bonemat, color);
+		copy_v3_v3(final_color, color);
+		final_color[3] = 1.0f; /* hack */
+		DRW_shgroup_call_dynamic_add(shgrp_geom_wire, final_bonemat, final_color);
 	}
 }