archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-04-15 12:03:09 +02:00
parent f3a8f97fcf 0f2efce6c5
commit 9e2ea6c500
32 changed files with 176 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/transform/transform_generics.c
View File

@@ -853,7 +853,7 @@ static void recalcData_objects(TransInfo *t)
mul_qt_v3(qrot, up_axis);
/* roll has a tendency to flip in certain orientations - [#34283], [#33974] */
roll = ED_rollBoneToVector(ebo, up_axis, false);
roll = ED_armature_ebone_roll_to_vector(ebo, up_axis, false);
ebo->roll = angle_compat_rad(roll, td->ival);
}
}
@@ -862,7 +862,7 @@ static void recalcData_objects(TransInfo *t)
if (arm->flag & ARM_MIRROR_EDIT) {
if (t->state != TRANS_CANCEL)
transform_armature_mirror_update(t->obedit);
ED_armature_edit_transform_mirror_update(t->obedit);
else
restoreBones(t);
}