diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-05-05 21:51:16 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-05-05 22:04:21 +0300 |
| commit | 817cf2a317388b8bfc29ddf27a49b0628eb8e1ab (patch) | |
| tree | ba91e9fbe5ed957d05634de1f0df514d2b4d91ad /source/blender/draw/intern/draw_armature.c | |
| parent | b2188d631a81972f38548a333757eb21ddd784b0 (diff) | |
Armature: Rename bone shaders and add 2 colors smooth blending.
This will enable us to do more nice stuff in future commits.
This commit is a temporary commit, it will compile but will crash if
trying to display any armature. Next commit does work.
Diffstat (limited to 'source/blender/draw/intern/draw_armature.c')
| -rw-r--r-- | source/blender/draw/intern/draw_armature.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index 7b29b213bec..9a293d28c81 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -260,7 +260,7 @@ static void drw_shgroup_bone_envelope_solid( DRW_shgroup_state_enable(g_data.bone_envelope_solid, DRW_STATE_CULL_BACK); } if (g_data.bone_point_solid == NULL) { - g_data.bone_point_solid = shgroup_instance_bone_sphere(g_data.pass_bone_solid); + g_data.bone_point_solid = shgroup_instance_bone_sphere_solid(g_data.pass_bone_solid); } drw_shgroup_bone_envelope(g_data.bone_point_solid, @@ -350,7 +350,7 @@ static void drw_shgroup_bone_custom_wire(const float (*bone_mat)[4], const float static void drw_shgroup_bone_point_solid(const float (*bone_mat)[4], const float color[4]) { if (g_data.bone_point_solid == NULL) { - g_data.bone_point_solid = shgroup_instance_bone_sphere(g_data.pass_bone_solid); + g_data.bone_point_solid = shgroup_instance_bone_sphere_solid(g_data.pass_bone_solid); } float final_bonemat[4][4]; mul_m4_m4m4(final_bonemat, g_data.ob->obmat, bone_mat); |