Math Lib: merging over some changes from the sculpt branch:

* swap v2/v3
* multiply-and-add (madd) v3
* inline v3 short/float conversion
* mul_v3_m3v3

1 files changed, 10 insertions, 2 deletions

diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h
index e21c3800acc..399c234a108 100644
--- a/source/blender/blenlib/BLI_math_vector.h
+++ b/source/blender/blenlib/BLI_math_vector.h
@@ -54,6 +54,9 @@ MINLINE void zero_v3(float r[3]);
 MINLINE void copy_v2_v2(float r[2], float a[2]);
 MINLINE void copy_v3_v3(float r[3], float a[3]);
 
+MINLINE void swap_v2_v2(float a[2], float b[2]);
+MINLINE void swap_v3_v3(float a[3], float b[3]);
+
 /********************************* Arithmetic ********************************/
 
 MINLINE void add_v2_v2(float r[2], float a[2]);
@@ -72,6 +75,11 @@ MINLINE void mul_v3_v3fl(float r[3], float a[3], float f);
 MINLINE void mul_v3_v3(float r[3], float a[3]);
 MINLINE void mul_v3_v3v3(float r[3], float a[3], float b[3]);
 
+MINLINE void madd_v3_v3fl(float r[3], float a[3], float f);
+MINLINE void madd_v3_v3v3(float r[3], float a[3], float b[3]);
+MINLINE void madd_v3_v3v3fl(float r[3], float a[3], float b[3], float f);
+MINLINE void madd_v3_v3v3v3(float r[3], float a[3], float b[3], float c[3]);
+
 MINLINE void negate_v3(float r[3]);
 MINLINE void negate_v3_v3(float r[3], float a[3]);
 
@@ -137,8 +145,8 @@ void print_v2(char *str, float a[2]);
 void print_v3(char *str, float a[3]);
 void print_v4(char *str, float a[4]);
 
-void normal_short_to_float_v3(float r[3], short n[3]);
-void normal_float_to_short_v3(short r[3], float n[3]);
+MINLINE void normal_short_to_float_v3(float r[3], short n[3]);
+MINLINE void normal_float_to_short_v3(short r[3], float n[3]);
 
 void minmax_v3_v3v3(float r[3], float min[3], float max[3]);