Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-03-04 23:54:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-04 23:59:34 +0300
commita297a6c444c7463295f0447a55a5f9542414529c (patch)
tree964875831032df99b2625c4748992c70ddb7231f /source/blender/blenkernel
parenta5c4a44df67ed69844a433179629d861cf10f438 (diff)
Cleanup: replace unnecessary MEM_callocN calls
Use MEM_mallocN when memory is immediately copied over.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/curve.c2
-rw-r--r--source/blender/blenkernel/intern/report.c2
-rw-r--r--source/blender/blenkernel/intern/tracking.c2
-rw-r--r--source/blender/blenkernel/intern/tracking_solver.c2
4 files changed, 4 insertions, 4 deletions
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);
}