From 6540bb1375b025ef0b65bc65a54b7f8ea6cfed8e Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Fri, 22 Oct 2010 10:17:55 +0000 Subject: Add some missing const's --- source/blender/blenlib/BLI_math_base.h | 1 + source/blender/blenlib/BLI_math_matrix.h | 2 +- source/blender/blenlib/BLI_math_vector.h | 4 ++-- source/blender/blenlib/intern/math_rotation.c | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'source') diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 77266e2e9d8..2feacd64651 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -128,6 +128,7 @@ extern "C" { #ifndef FREE_WINDOWS #define isnan(n) _isnan(n) #define finite _finite +#define hypot _hypot #endif #endif diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h index e4f477238f5..d25707d480c 100644 --- a/source/blender/blenlib/BLI_math_matrix.h +++ b/source/blender/blenlib/BLI_math_matrix.h @@ -142,7 +142,7 @@ void mat3_to_size(float r[3], float M[3][3]); void mat4_to_size(float r[3], float M[4][4]); void translate_m4(float mat[4][4], float tx, float ty, float tz); -void rotate_m4(float mat[4][4], char axis, float angle); +void rotate_m4(float mat[4][4], const char axis, const float angle); void loc_eul_size_to_mat4(float R[4][4], const float loc[3], const float eul[3], const float size[3]); diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index 93d463e17ea..3fceef36e2a 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -168,8 +168,8 @@ void minmax_v3v3_v3(float min[3], float max[3], const float vec[3]); /***************************** Array Functions *******************************/ /* attempted to follow fixed length vertex functions. names could be improved*/ void range_vni(int *array, const int size, const int start); -void mul_vn_fl(float *array, int size, const float f); -void mul_vn_vn_fl(float *array_tar, const float *array_src, int size, const float f); +void mul_vn_fl(float *array, const int size, const float f); +void mul_vn_vn_fl(float *array_tar, const float *array_src, const int size, const float f); void add_vn_vn(float *array_tar, const float *array_src, const int size); void fill_vni(int *array_tar, const int size, const int val); diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index 7f615462ab0..7debdcdb015 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -624,7 +624,7 @@ void quat_to_axis_angle(float axis[3], float *angle, const float q[4]) } /* Axis Angle to Euler Rotation */ -void axis_angle_to_eulO(float eul[3], short order, const float axis[3], const float angle) +void axis_angle_to_eulO(float eul[3], const short order, const float axis[3], const float angle) { float q[4]; @@ -1175,7 +1175,7 @@ void mat3_to_eulO(float e[3], short order,float M[3][3]) } /* Convert 4x4 matrix to Euler angles (in radians). */ -void mat4_to_eulO(float e[3], short order,float M[4][4]) +void mat4_to_eulO(float e[3], const short order,float M[4][4]) { float m[3][3]; -- cgit v1.2.3