griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Armature: Fix T55070: Bones relationship lines are offsetted

Browse Source 
Was missing object matrix multiplication.
This commit is contained in:
Clément Foucault
2018-05-16 14:53:41 +02:00
parent a25856f2a8
commit bcfe075f89
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -370,8 +370,11 @@ static void drw_shgroup_bone_relationship_lines(const float start[3], const floa
g_data.lines_relationship = shgroup_dynlines_dashed_uniform_color(g_data.passes.relationship_lines, g_theme.wire_color);
}
/* reverse order to have less stipple overlap */
DRW_shgroup_call_dynamic_add(g_data.lines_relationship, end);
DRW_shgroup_call_dynamic_add(g_data.lines_relationship, start);
float v[3];
mul_v3_m4v3(v, g_data.ob->obmat, end);
DRW_shgroup_call_dynamic_add(g_data.lines_relationship, v);
mul_v3_m4v3(v, g_data.ob->obmat, start);
DRW_shgroup_call_dynamic_add(g_data.lines_relationship, v);
}
static void drw_shgroup_bone_ik_lines(const float start[3], const float end[3])
@@ -381,8 +384,11 @@ static void drw_shgroup_bone_ik_lines(const float start[3], const float end[3])
g_data.lines_ik = shgroup_dynlines_dashed_uniform_color(g_data.passes.relationship_lines, fcolor);
}
/* reverse order to have less stipple overlap */
DRW_shgroup_call_dynamic_add(g_data.lines_ik, end);
DRW_shgroup_call_dynamic_add(g_data.lines_ik, start);
float v[3];
mul_v3_m4v3(v, g_data.ob->obmat, end);
DRW_shgroup_call_dynamic_add(g_data.lines_ik, v);
mul_v3_m4v3(v, g_data.ob->obmat, start);
DRW_shgroup_call_dynamic_add(g_data.lines_ik, v);
}
static void drw_shgroup_bone_ik_no_target_lines(const float start[3], const float end[3])