merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index 0a455edf398..b2d20eb7526 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -1378,11 +1378,11 @@ static void p_polygon_kernel_center(float (*points)[2], int npoints, float *cent
 
 		if (nnewpoints*2 > size) {
 			size *= 2;
-			free(oldpoints);
-			oldpoints = malloc(sizeof(float)*2*size);
+			MEM_freeN(oldpoints);
+			oldpoints = MEM_mallocN(sizeof(float)*2*size, "oldpoints");
 			memcpy(oldpoints, newpoints, sizeof(float)*2*nnewpoints);
-			free(newpoints);
-			newpoints = malloc(sizeof(float)*2*size);
+			MEM_freeN(newpoints);
+			newpoints = MEM_mallocN(sizeof(float)*2*size, "newpoints");
 		}
 		else {
 			float (*sw_points)[2] = oldpoints;