diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-08-27 14:59:15 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-08-27 14:59:15 +0400 |
| commit | b3f311784d6c356eac2ff46e796d4a39cfc935c8 (patch) | |
| tree | fe1a81243b21f16339373a8ebfff5e6daa7af3d6 /source/blender/blenlib/BLI_math_vector.h | |
| parent | e777ee95f03e98d9842d47c173363b252e9663e9 (diff) | |
| parent | 13254cde8c7ca38af2dcec35efdb9f8f9b3bca46 (diff) | |
Merge with trunk r50245 + fixed issues caused by previous (failed?) merge.
Diffstat (limited to 'source/blender/blenlib/BLI_math_vector.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_vector.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index 3d111e61e82..d63df752fe3 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -221,6 +221,9 @@ MINLINE void normal_float_to_short_v3(short r[3], const float n[3]); void minmax_v3v3_v3(float min[3], float max[3], const float vec[3]); +void dist_ensure_v3_v3fl(float v1[3], const float v2[3], const float dist); +void dist_ensure_v2_v2fl(float v1[2], const float v2[2], const float dist); + /***************************** Array Functions *******************************/ /* attempted to follow fixed length vertex functions. names could be improved*/ double dot_vn_vn(const float *array_src_a, const float *array_src_b, const int size); |