reproject

- use render mesh settings rather then view settings.
- fixed bug with brush size being overwritten and allowing non mesh objects to be projected onto.
- made the paint loop less messy & minor cleanup

2 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h
index fc2d257707a..c77f76a6674 100644
--- a/source/blender/blenlib/BLI_math_vector.h
+++ b/source/blender/blenlib/BLI_math_vector.h
@@ -147,8 +147,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]);
 
-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]);
+MINLINE void normal_short_to_float_v3(float r[3], const short n[3]);
+MINLINE void normal_float_to_short_v3(short r[3], const float n[3]);
 
 void minmax_v3_v3v3(float r[3], float min[3], float max[3]);
 
diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c
index 3a252530ac4..9bb960340ac 100644
--- a/source/blender/blenlib/intern/math_vector_inline.c
+++ b/source/blender/blenlib/intern/math_vector_inline.c
@@ -348,14 +348,14 @@ MINLINE float normalize_v3(float n[3])
 	return normalize_v3_v3(n, n);
 }
 
-MINLINE void normal_short_to_float_v3(float *out, short *in)
+MINLINE void normal_short_to_float_v3(float *out, const short *in)
 {
 	out[0] = in[0]*(1.0f/32767.0f);
 	out[1] = in[1]*(1.0f/32767.0f);
 	out[2] = in[2]*(1.0f/32767.0f);
 }
 
-MINLINE void normal_float_to_short_v3(short *out, float *in)
+MINLINE void normal_float_to_short_v3(short *out, const float *in)
 {
 	out[0] = (short)(in[0]*32767.0f);
 	out[1] = (short)(in[1]*32767.0f);