svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined

3 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 16102f466da..d43f114e2af 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -3235,7 +3235,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 
 								/* Also cast a ray in opposite direction to make sure
 								*  point is at least surrounded by two brush faces */
-								mul_v3_fl(ray_dir, -1.0f);
+								negate_v3(ray_dir);
 								hit.index = -1;
 								hit.dist = 9999;
 
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 82da0e549d9..8f50fb25f45 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -1913,7 +1913,7 @@ static void do_kink(ParticleKey *state, ParticleKey *par, float *par_rot, float
 	switch(type) {
 	case PART_KINK_CURL:
 	{
-		mul_v3_fl(par_vec, -1.f);
+		negate_v3(par_vec);
 
 		if(flat > 0.f) {
 			float proj[3];
@@ -1979,7 +1979,7 @@ static void do_kink(ParticleKey *state, ParticleKey *par, float *par_rot, float
 			mul_qt_v3(par_rot, z_vec);
 		}
 		
-		mul_v3_fl(par_vec, -1.f);
+		negate_v3(par_vec);
 		normalize_v3_v3(vec_one, par_vec);
 
 		inp_y=dot_v3v3(y_vec, vec_one);
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 0caad666226..3f127c7656b 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2680,7 +2680,7 @@ static float nr_signed_distance_to_plane(float *p, float radius, ParticleCollisi
 	}
 
 	if(pce->inv_nor == 1) {
-		mul_v3_fl(nor, -1.f);
+		negate_v3(nor);
 		d = -d;
 	}
 
@@ -2800,7 +2800,7 @@ static void collision_point_on_surface(float p[3], ParticleCollisionElement *pce
 				normalize_v3(nor);
 
 				if(pce->inv_nor == 1)
-					mul_v3_fl(nor, -1.f);
+					negate_v3(nor);
 
 				madd_v3_v3v3fl(co, pce->x0, nor, col->radius);
 				madd_v3_v3fl(co, e1, pce->uv[0]);