[Bf-blender-cvs] [78836c0] master: Fix T46743: Crash w/ limit rotation constraint
Campbell Barton
noreply at git.blender.org
Tue Nov 10 18:53:59 CET 2015
Commit: 78836c021101a59886e4881fe57dc26a9a65753d
Author: Campbell Barton
Date: Wed Nov 11 04:46:55 2015 +1100
Branches: master
https://developer.blender.org/rB78836c021101a59886e4881fe57dc26a9a65753d
Fix T46743: Crash w/ limit rotation constraint
Using axis-angle + limit rotations 'Transform' option was crashing.
===================================================================
M source/blender/editors/transform/transform.c
===================================================================
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index cd339e1..2fcdb19 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2650,7 +2650,7 @@ static void constraintob_from_transdata(bConstraintOb *cob, TransData *td)
}
else if (td->ext->rotOrder == ROT_MODE_AXISANGLE) {
/* axis angle */
- axis_angle_to_mat4(cob->matrix, &td->ext->quat[1], td->ext->quat[0]);
+ axis_angle_to_mat4(cob->matrix, td->ext->rotAxis, *td->ext->rotAngle);
}
else {
/* eulers */
@@ -2716,7 +2716,7 @@ static void constraintRotLim(TransInfo *UNUSED(t), TransData *td)
}
else if (td->ext->rotOrder == ROT_MODE_AXISANGLE) {
/* axis angle */
- mat4_to_axis_angle(&td->ext->quat[1], &td->ext->quat[0], cob.matrix);
+ mat4_to_axis_angle(td->ext->rotAxis, td->ext->rotAngle, cob.matrix);
}
else {
/* eulers */
More information about the Bf-blender-cvs
mailing list