diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-04-04 06:45:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-04 06:45:54 +0300 |
| commit | 89a3e4deffde3f3a20fad22cf95f368153d3da32 (patch) | |
| tree | 3faa8f73197084f31aa641af1da4be6970e850ed /source/blender/blenlib/intern/math_rotation.c | |
| parent | 519e20f9849e13d697aaee6dcab747896f110312 (diff) | |
Cleanup: redundant normalize in expmap_to_quat
Diffstat (limited to 'source/blender/blenlib/intern/math_rotation.c')
| -rw-r--r-- | source/blender/blenlib/intern/math_rotation.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index 3d5d47bc2e0..7706e8e8e49 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -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 *********************************/ |