diff --git a/glm/gtx/rotate_vector.inl b/glm/gtx/rotate_vector.inl index 236182a5..53929cc2 100644 --- a/glm/gtx/rotate_vector.inl +++ b/glm/gtx/rotate_vector.inl @@ -204,8 +204,12 @@ namespace glm if(all(equal(Normal, Up))) return detail::tmat4x4(T(1)); - detail::tvec3 RotationAxis = cross(Up, Normal); - T Angle = degrees(acos(dot(Normal, Up))); + detail::tvec3 RotationAxis = cross(Up, Normal); +# ifdef GLM_FORCE_RADIANS + T Angle = acos(dot(Normal, Up)); +# else + T Angle = degrees(acos(dot(Normal, Up))); +# endif return rotate(Angle, RotationAxis); } }//namespace glm diff --git a/readme.txt b/readme.txt index 9a100e7f..3111ea4d 100644 --- a/readme.txt +++ b/readme.txt @@ -70,6 +70,7 @@ GLM 0.9.4.6: 2013-08-XX - Added use of GCC frontend on Unix for ICC and Visual C++ fronted on Windows for ICC - Added compilation errors for unsupported compiler versions +- Fixed glm::orientation with GLM_FORCE_RADIANS defined #112 ================================================================================ GLM 0.9.4.5: 2013-08-12