forked from bartvdbraak/blender
Cleanup: redundant normalize in expmap_to_quat
This commit is contained in:
parent
519e20f984
commit
89a3e4deff
@ -1043,11 +1043,12 @@ void expmap_to_quat(float r[4], const float expmap[3])
|
||||
float angle;
|
||||
|
||||
/* Obtain axis/angle representation. */
|
||||
angle = normalize_v3_v3(axis, expmap);
|
||||
angle = angle_wrap_rad(angle);
|
||||
|
||||
/* Convert to quaternion. */
|
||||
axis_angle_to_quat(r, axis, angle);
|
||||
if (LIKELY((angle = normalize_v3_v3(axis, expmap)) != 0.0f)) {
|
||||
axis_angle_normalized_to_quat(r, axis, angle_wrap_rad(angle));
|
||||
}
|
||||
else {
|
||||
unit_qt(r);
|
||||
}
|
||||
}
|
||||
|
||||
/******************************** XYZ Eulers *********************************/
|
||||
|
@ -806,7 +806,7 @@ static int flyApply(bContext *C, FlyInfo *fly)
|
||||
copy_v3_fl3(upvec, 1.0f, 0.0f, 0.0f);
|
||||
mul_m3_v3(mat, upvec);
|
||||
/* Rotate about the relative up vec */
|
||||
axis_angle_to_quat(tmp_quat, upvec, (float)moffset[1] * time_redraw * -FLY_ROTATE_FAC);
|
||||
axis_angle_to_quat(tmp_quat, upvec, moffset[1] * time_redraw * -FLY_ROTATE_FAC);
|
||||
mul_qt_qtqt(rv3d->viewquat, rv3d->viewquat, tmp_quat);
|
||||
|
||||
if (fly->xlock != FLY_AXISLOCK_STATE_OFF)
|
||||
@ -836,7 +836,7 @@ static int flyApply(bContext *C, FlyInfo *fly)
|
||||
}
|
||||
|
||||
/* Rotate about the relative up vec */
|
||||
axis_angle_to_quat(tmp_quat, upvec, (float)moffset[0] * time_redraw * FLY_ROTATE_FAC);
|
||||
axis_angle_to_quat(tmp_quat, upvec, moffset[0] * time_redraw * FLY_ROTATE_FAC);
|
||||
mul_qt_qtqt(rv3d->viewquat, rv3d->viewquat, tmp_quat);
|
||||
|
||||
if (fly->xlock != FLY_AXISLOCK_STATE_OFF)
|
||||
|
Loading…
Reference in New Issue
Block a user