forked from bartvdbraak/blender
Cleanup: use malloc when calloc is overwritten
This commit is contained in:
parent
e4d016ce48
commit
b53eb9e18b
@ -1464,10 +1464,10 @@ DerivedMesh *multires_make_derived_from_derived(DerivedMesh *dm,
|
|||||||
gridData = result->getGridData(result);
|
gridData = result->getGridData(result);
|
||||||
result->getGridKey(result, &key);
|
result->getGridKey(result, &key);
|
||||||
|
|
||||||
subGridData = MEM_callocN(sizeof(CCGElem *) * numGrids, "subGridData*");
|
subGridData = MEM_mallocN(sizeof(CCGElem *) * numGrids, "subGridData*");
|
||||||
|
|
||||||
for (i = 0; i < numGrids; i++) {
|
for (i = 0; i < numGrids; i++) {
|
||||||
subGridData[i] = MEM_callocN(key.elem_size * gridSize * gridSize, "subGridData");
|
subGridData[i] = MEM_mallocN(key.elem_size * gridSize * gridSize, "subGridData");
|
||||||
memcpy(subGridData[i], gridData[i], key.elem_size * gridSize * gridSize);
|
memcpy(subGridData[i], gridData[i], key.elem_size * gridSize * gridSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -756,7 +756,7 @@ static short gp_stroke_eraser_splitdel(bGPDframe *gpf, bGPDstroke *gps, int i)
|
|||||||
else if (i == gps->totpoints - 2) {
|
else if (i == gps->totpoints - 2) {
|
||||||
/* allocate new points array, and assign most of the old stroke there */
|
/* allocate new points array, and assign most of the old stroke there */
|
||||||
gps->totpoints--;
|
gps->totpoints--;
|
||||||
gps->points = MEM_callocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points");
|
gps->points = MEM_mallocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points");
|
||||||
memcpy(gps->points, pt_tmp, sizeof(bGPDspoint) * gps->totpoints);
|
memcpy(gps->points, pt_tmp, sizeof(bGPDspoint) * gps->totpoints);
|
||||||
|
|
||||||
/* free temp buffer */
|
/* free temp buffer */
|
||||||
@ -770,7 +770,7 @@ static short gp_stroke_eraser_splitdel(bGPDframe *gpf, bGPDstroke *gps, int i)
|
|||||||
else if (i == 0) {
|
else if (i == 0) {
|
||||||
/* allocate new points array, and assign most of the old stroke there */
|
/* allocate new points array, and assign most of the old stroke there */
|
||||||
gps->totpoints--;
|
gps->totpoints--;
|
||||||
gps->points = MEM_callocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points");
|
gps->points = MEM_mallocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points");
|
||||||
memcpy(gps->points, pt_tmp + 1, sizeof(bGPDspoint) * gps->totpoints);
|
memcpy(gps->points, pt_tmp + 1, sizeof(bGPDspoint) * gps->totpoints);
|
||||||
|
|
||||||
/* We must adjust timings!
|
/* We must adjust timings!
|
||||||
@ -807,7 +807,7 @@ static short gp_stroke_eraser_splitdel(bGPDframe *gpf, bGPDstroke *gps, int i)
|
|||||||
BLI_insertlinkafter(&gpf->strokes, gps, gsn);
|
BLI_insertlinkafter(&gpf->strokes, gps, gsn);
|
||||||
|
|
||||||
gsn->totpoints = gps->totpoints - i;
|
gsn->totpoints = gps->totpoints - i;
|
||||||
gsn->points = MEM_callocN(sizeof(bGPDspoint) * gsn->totpoints, "gp_stroke_points");
|
gsn->points = MEM_mallocN(sizeof(bGPDspoint) * gsn->totpoints, "gp_stroke_points");
|
||||||
memcpy(gsn->points, pt_tmp + i, sizeof(bGPDspoint) * gsn->totpoints);
|
memcpy(gsn->points, pt_tmp + i, sizeof(bGPDspoint) * gsn->totpoints);
|
||||||
|
|
||||||
/* We must adjust timings of this new stroke!
|
/* We must adjust timings of this new stroke!
|
||||||
@ -831,8 +831,8 @@ static short gp_stroke_eraser_splitdel(bGPDframe *gpf, bGPDstroke *gps, int i)
|
|||||||
|
|
||||||
/* adjust existing stroke */
|
/* adjust existing stroke */
|
||||||
gps->totpoints = i;
|
gps->totpoints = i;
|
||||||
gps->points = MEM_callocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points");
|
gps->points = MEM_mallocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points");
|
||||||
memcpy(gps->points, pt_tmp, sizeof(bGPDspoint) * i);
|
memcpy(gps->points, pt_tmp, sizeof(bGPDspoint) * gps->totpoints);
|
||||||
|
|
||||||
/* free temp buffer */
|
/* free temp buffer */
|
||||||
MEM_freeN(pt_tmp);
|
MEM_freeN(pt_tmp);
|
||||||
|
Loading…
Reference in New Issue
Block a user