Merge pull request #691 from OlivierSohn/master

Fix rotation when vectors are in the same direction #691

glm/gtx/quaternion.inl

@@ -184,8 +184,10 @@ namespace glm
 		T cosTheta = dot(orig, dest);
 		vec<3, T, Q> rotationAxis;
 
-		if(cosTheta >= static_cast<T>(1) - epsilon<T>())
-			return quat();
+		if(cosTheta >= static_cast<T>(1) - epsilon<T>()) {
+			// orig and dest point in the same direction
+			return quat_identity<T,Q>();
+		}
 
 		if(cosTheta < static_cast<T>(-1) + epsilon<T>())
 		{