diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-05-16 19:40:25 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-05-16 19:46:35 +0300 |
| commit | 5ed702dc9cbd94d592b1997e6bd35d5b6e7a639f (patch) | |
| tree | 50c5568c305b5438f72a2c6461bacaf68d655728 /source/blender/draw/intern/draw_armature.c | |
| parent | 1b4916054e0c95f24949dc5c0bf6dbcd4bce4f2f (diff) | |
Armature: Fix T55068: Wireframe bones with custom shapes not working in object mode
Diffstat (limited to 'source/blender/draw/intern/draw_armature.c')
| -rw-r--r-- | source/blender/draw/intern/draw_armature.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); } } |