forked from bartvdbraak/blender
replace calloc with malloc for arrays that are filled in right after.
This commit is contained in:
parent
38825f891e
commit
5006a39c27
@ -169,7 +169,7 @@ static MPoly *dm_getPolyArray(DerivedMesh *dm)
|
|||||||
|
|
||||||
static MVert *dm_dupVertArray(DerivedMesh *dm)
|
static MVert *dm_dupVertArray(DerivedMesh *dm)
|
||||||
{
|
{
|
||||||
MVert *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumVerts(dm),
|
MVert *tmp = MEM_mallocN(sizeof(*tmp) * dm->getNumVerts(dm),
|
||||||
"dm_dupVertArray tmp");
|
"dm_dupVertArray tmp");
|
||||||
|
|
||||||
if (tmp) dm->copyVertArray(dm, tmp);
|
if (tmp) dm->copyVertArray(dm, tmp);
|
||||||
@ -179,7 +179,7 @@ static MVert *dm_dupVertArray(DerivedMesh *dm)
|
|||||||
|
|
||||||
static MEdge *dm_dupEdgeArray(DerivedMesh *dm)
|
static MEdge *dm_dupEdgeArray(DerivedMesh *dm)
|
||||||
{
|
{
|
||||||
MEdge *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumEdges(dm),
|
MEdge *tmp = MEM_mallocN(sizeof(*tmp) * dm->getNumEdges(dm),
|
||||||
"dm_dupEdgeArray tmp");
|
"dm_dupEdgeArray tmp");
|
||||||
|
|
||||||
if (tmp) dm->copyEdgeArray(dm, tmp);
|
if (tmp) dm->copyEdgeArray(dm, tmp);
|
||||||
@ -189,7 +189,7 @@ static MEdge *dm_dupEdgeArray(DerivedMesh *dm)
|
|||||||
|
|
||||||
static MFace *dm_dupFaceArray(DerivedMesh *dm)
|
static MFace *dm_dupFaceArray(DerivedMesh *dm)
|
||||||
{
|
{
|
||||||
MFace *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumTessFaces(dm),
|
MFace *tmp = MEM_mallocN(sizeof(*tmp) * dm->getNumTessFaces(dm),
|
||||||
"dm_dupFaceArray tmp");
|
"dm_dupFaceArray tmp");
|
||||||
|
|
||||||
if (tmp) dm->copyTessFaceArray(dm, tmp);
|
if (tmp) dm->copyTessFaceArray(dm, tmp);
|
||||||
@ -199,7 +199,7 @@ static MFace *dm_dupFaceArray(DerivedMesh *dm)
|
|||||||
|
|
||||||
static MLoop *dm_dupLoopArray(DerivedMesh *dm)
|
static MLoop *dm_dupLoopArray(DerivedMesh *dm)
|
||||||
{
|
{
|
||||||
MLoop *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumLoops(dm),
|
MLoop *tmp = MEM_mallocN(sizeof(*tmp) * dm->getNumLoops(dm),
|
||||||
"dm_dupLoopArray tmp");
|
"dm_dupLoopArray tmp");
|
||||||
|
|
||||||
if (tmp) dm->copyLoopArray(dm, tmp);
|
if (tmp) dm->copyLoopArray(dm, tmp);
|
||||||
@ -209,7 +209,7 @@ static MLoop *dm_dupLoopArray(DerivedMesh *dm)
|
|||||||
|
|
||||||
static MPoly *dm_dupPolyArray(DerivedMesh *dm)
|
static MPoly *dm_dupPolyArray(DerivedMesh *dm)
|
||||||
{
|
{
|
||||||
MPoly *tmp = MEM_callocN(sizeof(*tmp) * dm->getNumPolys(dm),
|
MPoly *tmp = MEM_mallocN(sizeof(*tmp) * dm->getNumPolys(dm),
|
||||||
"dm_dupPolyArray tmp");
|
"dm_dupPolyArray tmp");
|
||||||
|
|
||||||
if (tmp) dm->copyPolyArray(dm, tmp);
|
if (tmp) dm->copyPolyArray(dm, tmp);
|
||||||
@ -574,7 +574,7 @@ void DM_to_meshkey(DerivedMesh *dm, Mesh *me, KeyBlock *kb)
|
|||||||
if (totvert == 0 || me->totvert == 0 || me->totvert != totvert) return;
|
if (totvert == 0 || me->totvert == 0 || me->totvert != totvert) return;
|
||||||
|
|
||||||
if (kb->data) MEM_freeN(kb->data);
|
if (kb->data) MEM_freeN(kb->data);
|
||||||
kb->data = MEM_callocN(me->key->elemsize * me->totvert, "kb->data");
|
kb->data = MEM_mallocN(me->key->elemsize * me->totvert, "kb->data");
|
||||||
kb->totelem = totvert;
|
kb->totelem = totvert;
|
||||||
|
|
||||||
fp = kb->data;
|
fp = kb->data;
|
||||||
@ -2359,15 +2359,14 @@ DMCoNo *mesh_get_mapped_verts_nors(Scene *scene, Object *ob)
|
|||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX);
|
dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX);
|
||||||
vertexcosnos = MEM_callocN(sizeof(DMCoNo) * me->totvert, "vertexcosnos map");
|
|
||||||
|
|
||||||
if (dm->foreachMappedVert) {
|
if (dm->foreachMappedVert) {
|
||||||
|
vertexcosnos = MEM_callocN(sizeof(DMCoNo) * me->totvert, "vertexcosnos map");
|
||||||
dm->foreachMappedVert(dm, make_vertexcosnos__mapFunc, vertexcosnos);
|
dm->foreachMappedVert(dm, make_vertexcosnos__mapFunc, vertexcosnos);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
DMCoNo *v_co_no = vertexcosnos;
|
DMCoNo *v_co_no = vertexcosnos = MEM_mallocN(sizeof(DMCoNo) * me->totvert, "vertexcosnos map");
|
||||||
int a;
|
int a;
|
||||||
|
|
||||||
for (a = 0; a < me->totvert; a++, v_co_no++) {
|
for (a = 0; a < me->totvert; a++, v_co_no++) {
|
||||||
dm->getVertCo(dm, a, v_co_no->co);
|
dm->getVertCo(dm, a, v_co_no->co);
|
||||||
dm->getVertNo(dm, a, v_co_no->no);
|
dm->getVertNo(dm, a, v_co_no->no);
|
||||||
|
Loading…
Reference in New Issue
Block a user