blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T39874: Bone roll resets if bones are moved in edit mode 

Own stupid typo in rBee387c6addb2, sigh...
This commit is contained in:
Bastien Montagne 2014-04-24 21:15:43 +02:00
parent 030ae5cadf
commit 16443b1ae0
Notes: blender-bot 2023-09-13 08:48:34 +02:00 
Referenced by issue #39874, Bone roll resets if bones are moved in edit mode
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/armature/armature_edit.c
View File

@ -217,7 +217,7 @@ float ED_rollBoneToVector(EditBone *bone, const float align_axis[3], const bool
vec_roll_to_mat3(nor, 0.0f, mat);
/* check the bone isn't aligned with the axis */
if (is_zero_v3(align_axis) || dot_v3v3(align_axis, mat[2]) <= (1.0f - FLT_EPSILON)) {
if (dot_v3v3(align_axis, mat[2]) >= (1.0f - FLT_EPSILON)) {
return roll;
}
@ -226,7 +226,7 @@ float ED_rollBoneToVector(EditBone *bone, const float align_axis[3], const bool
sub_v3_v3v3(align_axis_proj, align_axis, vec);
if (axis_only) {
if (angle_v3v3(align_axis_proj, mat[2]) > (float)(M_PI / 2.0)) {
if (angle_v3v3(align_axis_proj, mat[2]) > (float)(M_PI_2)) {
negate_v3(align_axis_proj);
}
}
@ -236,9 +236,8 @@ float ED_rollBoneToVector(EditBone *bone, const float align_axis[3], const bool
cross_v3_v3v3(vec, mat[2], align_axis_proj);
if (dot_v3v3(vec, nor) < 0.0f) {
roll = -roll;
return -roll;
}
return roll;
}