archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source
This commit is contained in:
Joseph Eagar
2010-03-09 04:32:40 +00:00
parent ea540496c8 790d6ca256
commit 71003b9bcc
2116 changed files with 76457 additions and 47789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/uvedit/uvedit_parametrizer.c
View File

@@ -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;