diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 81939dbaafc..a91e43792f7 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3031,7 +3031,7 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) blnext = bl->next; if (bl->nr && bl->dupe_nr) { nr = bl->nr - bl->dupe_nr + 1; /* +1 because vectorbezier sets flag too */ - blnew = MEM_callocN(sizeof(BevList), "makeBevelList4"); + blnew = MEM_mallocN(sizeof(BevList), "makeBevelList4"); memcpy(blnew, bl, sizeof(BevList)); blnew->bevpoints = MEM_calloc_arrayN(nr, sizeof(BevPoint), "makeBevelPoints4"); if (!blnew->bevpoints) { diff --git a/source/blender/blenkernel/intern/report.c b/source/blender/blenkernel/intern/report.c index 6b8d7f856ce..9719fda11cc 100644 --- a/source/blender/blenkernel/intern/report.c +++ b/source/blender/blenkernel/intern/report.c @@ -121,7 +121,7 @@ void BKE_report(ReportList *reports, ReportType type, const char *_message) report->typestr = BKE_report_type_str(type); len = strlen(message); - message_alloc = MEM_callocN(sizeof(char) * (len + 1), "ReportMessage"); + message_alloc = MEM_mallocN(sizeof(char) * (len + 1), "ReportMessage"); memcpy(message_alloc, message, sizeof(char) * (len + 1)); report->message = message_alloc; report->len = len; diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 483838ed741..f1243330567 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -899,7 +899,7 @@ void BKE_tracking_tracks_join(MovieTracking *tracking, MEM_freeN(dst_track->markers); - dst_track->markers = MEM_callocN(i * sizeof(MovieTrackingMarker), "tracking joined tracks"); + dst_track->markers = MEM_mallocN(i * sizeof(MovieTrackingMarker), "tracking joined tracks"); memcpy(dst_track->markers, markers, i * sizeof(MovieTrackingMarker)); dst_track->markersnr = i; diff --git a/source/blender/blenkernel/intern/tracking_solver.c b/source/blender/blenkernel/intern/tracking_solver.c index 527a2f59491..3a82e375b0b 100644 --- a/source/blender/blenkernel/intern/tracking_solver.c +++ b/source/blender/blenkernel/intern/tracking_solver.c @@ -243,7 +243,7 @@ static bool reconstruct_retrieve_libmv_tracks(MovieReconstructContext *context, if (reconstruction->camnr) { int size = reconstruction->camnr * sizeof(MovieReconstructedCamera); - reconstruction->cameras = MEM_callocN(size, "reconstructed camera"); + reconstruction->cameras = MEM_mallocN(size, "reconstructed camera"); memcpy(reconstruction->cameras, reconstructed, size); } diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index ee4a26475b9..1931f35922a 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -677,12 +677,12 @@ static void gp_duplicate_points(const bGPDstroke *gps, gpsd->tot_triangles = 0; /* now, make a new points array, and copy of the relevant parts */ - gpsd->points = MEM_callocN(sizeof(bGPDspoint) * len, "gps stroke points copy"); + gpsd->points = MEM_mallocN(sizeof(bGPDspoint) * len, "gps stroke points copy"); memcpy(gpsd->points, gps->points + start_idx, sizeof(bGPDspoint) * len); gpsd->totpoints = len; if (gps->dvert != NULL) { - gpsd->dvert = MEM_callocN(sizeof(MDeformVert) * len, "gps stroke weights copy"); + gpsd->dvert = MEM_mallocN(sizeof(MDeformVert) * len, "gps stroke weights copy"); memcpy(gpsd->dvert, gps->dvert + start_idx, sizeof(MDeformVert) * len); /* Copy weights */ diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 832e2a94488..08d7ee4d67c 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -430,7 +430,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) for (dg = ob_iter->defbase.first; dg; dg = dg->next) { /* See if this group exists in the object (if it doesn't, add it to the end) */ if (!defgroup_find_name(ob, dg->name)) { - odg = MEM_callocN(sizeof(bDeformGroup), "join deformGroup"); + odg = MEM_mallocN(sizeof(bDeformGroup), "join deformGroup"); memcpy(odg, dg, sizeof(bDeformGroup)); BLI_addtail(&ob->defbase, odg); } @@ -443,7 +443,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) for (bFaceMap *fmap = ob_iter->fmaps.first; fmap; fmap = fmap->next) { /* See if this group exists in the object (if it doesn't, add it to the end) */ if (BKE_object_facemap_find_name(ob, fmap->name) == NULL) { - bFaceMap *fmap_new = MEM_callocN(sizeof(bFaceMap), "join faceMap"); + bFaceMap *fmap_new = MEM_mallocN(sizeof(bFaceMap), "join faceMap"); memcpy(fmap_new, fmap, sizeof(bFaceMap)); BLI_addtail(&ob->fmaps, fmap_new); } diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index e1a24326474..9aafdb02f69 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -332,7 +332,7 @@ static StructRNA *rna_KeyingSetInfo_register(Main *bmain, } /* create a new KeyingSetInfo type */ - ksi = MEM_callocN(sizeof(KeyingSetInfo), "python keying set info"); + ksi = MEM_mallocN(sizeof(KeyingSetInfo), "python keying set info"); memcpy(ksi, &dummyksi, sizeof(KeyingSetInfo)); /* set RNA-extensions info */ diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index e5445546491..cd2b0cb97dd 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -816,7 +816,7 @@ static StructRNA *rna_NodeTree_register(Main *bmain, } /* create a new node tree type */ - nt = MEM_callocN(sizeof(bNodeTreeType), "node tree type"); + nt = MEM_mallocN(sizeof(bNodeTreeType), "node tree type"); memcpy(nt, &dummynt, sizeof(dummynt)); nt->type = NTREE_CUSTOM; @@ -1650,7 +1650,7 @@ static bNodeType *rna_Node_register_base(Main *bmain, } /* create a new node type */ - nt = MEM_callocN(sizeof(bNodeType), "node type"); + nt = MEM_mallocN(sizeof(bNodeType), "node type"); memcpy(nt, &dummynt, sizeof(dummynt)); nt->free_self = (void (*)(bNodeType *))MEM_freeN; @@ -2178,7 +2178,7 @@ static StructRNA *rna_NodeSocket_register(Main *UNUSED(bmain), st = nodeSocketTypeFind(dummyst.idname); if (!st) { /* create a new node socket type */ - st = MEM_callocN(sizeof(bNodeSocketType), "node socket type"); + st = MEM_mallocN(sizeof(bNodeSocketType), "node socket type"); memcpy(st, &dummyst, sizeof(dummyst)); nodeRegisterSocketType(st); @@ -2494,7 +2494,7 @@ static StructRNA *rna_NodeSocketInterface_register(Main *UNUSED(bmain), } else { /* create a new node socket type */ - st = MEM_callocN(sizeof(bNodeSocketType), "node socket type"); + st = MEM_mallocN(sizeof(bNodeSocketType), "node socket type"); memcpy(st, &dummyst, sizeof(dummyst)); nodeRegisterSocketType(st); diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 2031c444c9a..2f64740830b 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -351,7 +351,7 @@ static StructRNA *rna_RenderEngine_register(Main *bmain, } /* create a new engine type */ - et = MEM_callocN(sizeof(RenderEngineType), "python render engine"); + et = MEM_mallocN(sizeof(RenderEngineType), "python render engine"); memcpy(et, &dummyet, sizeof(dummyet)); et->ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, et->idname, &RNA_RenderEngine); diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index a7f0c8ff19c..778e65d3276 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -341,7 +341,7 @@ static StructRNA *rna_Panel_register(Main *bmain, } /* create a new panel type */ - pt = MEM_callocN(sizeof(PanelType), "python buttons panel"); + pt = MEM_mallocN(sizeof(PanelType), "python buttons panel"); memcpy(pt, &dummypt, sizeof(dummypt)); pt->ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, pt->idname, &RNA_Panel); @@ -775,7 +775,7 @@ static StructRNA *rna_Header_register(Main *bmain, } /* create a new header type */ - ht = MEM_callocN(sizeof(HeaderType), "python buttons header"); + ht = MEM_mallocN(sizeof(HeaderType), "python buttons header"); memcpy(ht, &dummyht, sizeof(dummyht)); ht->ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, ht->idname, &RNA_Header);