merged 30707:31141 from trunk

[blender-staging.git] / source / blender / blenlib / intern / math_rotation.c

diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c
index 4d015e527a8f856e14138308bfa1b49d32650c22..a825935045f8aa0ce6222051711019e20a06ffda 100644 (file)
--- a/source/blender/blenlib/intern/math_rotation.c
+++ b/source/blender/blenlib/intern/math_rotation.c
@@ -138,7 +138,6 @@ void mul_fac_qt_fl(float *q, const float fac)
        q[1]*= si;
        q[2]*= si;
        q[3]*= si;
-       
 }
 
 void quat_to_mat3(float m[][3], float *q)
@@ -314,7 +313,6 @@ void mat3_to_quat_is_ok(float q[4], float wmat[3][3])
        mul_qt_qtqt(q, q1, q2);
 }
 
-
 void normalize_qt(float *q)
 {
        float len;
@@ -608,7 +606,7 @@ void axis_angle_to_quat(float q[4], float axis[3], float angle)
 }
 
 /* Quaternions to Axis Angle */
-void quat_to_axis_angle(float axis[3], float *angle,float q[4])
+void quat_to_axis_angle(float axis[3], float *angle, float q[4])
 {
        float ha, si;
        
@@ -710,7 +708,7 @@ void mat4_to_axis_angle(float axis[3], float *angle,float mat[4][4])
 }
 
 /****************************** Vector/Rotation ******************************/
-/* TODO: the following calls should probably be depreceated sometime         */
+/* TODO: the following calls should probably be deprecated sometime         */
 
 /* 3x3 matrix to axis angle */
 void mat3_to_vec_rot(float axis[3], float *angle,float mat[3][3])