From 94e5e2f5d811396f608045ab35f77437290f5759 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 29 Apr 2014 07:50:25 +1000 Subject: Code cleanup: simplify reallocs using MEM_recalloc --- source/blender/blenkernel/intern/curve.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'source/blender/blenkernel/intern/curve.c') diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 30638a14b8a..bf4e43944a4 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -701,19 +701,13 @@ void BKE_nurb_minmax(Nurb *nu, bool use_radius, float min[3], float max[3]) /* be sure to call makeknots after this */ void BKE_nurb_points_add(Nurb *nu, int number) { - BPoint *tmp = nu->bp; + BPoint *bp; int i; - nu->bp = (BPoint *)MEM_mallocN((nu->pntsu + number) * sizeof(BPoint), "rna_Curve_spline_points_add"); - - if (tmp) { - memmove(nu->bp, tmp, nu->pntsu * sizeof(BPoint)); - MEM_freeN(tmp); - } - memset(nu->bp + nu->pntsu, 0, number * sizeof(BPoint)); + nu->bp = MEM_recallocN(nu->bp, (nu->pntsu + number) * sizeof(BPoint)); - for (i = 0, tmp = nu->bp + nu->pntsu; i < number; i++, tmp++) { - tmp->radius = 1.0f; + for (i = 0, bp = &nu->bp[nu->pntsu]; i < number; i++, bp++) { + bp->radius = 1.0f; } nu->pntsu += number; @@ -721,19 +715,13 @@ void BKE_nurb_points_add(Nurb *nu, int number) void BKE_nurb_bezierPoints_add(Nurb *nu, int number) { - BezTriple *tmp = nu->bezt; + BezTriple *bezt; int i; - nu->bezt = (BezTriple *)MEM_mallocN((nu->pntsu + number) * sizeof(BezTriple), "rna_Curve_spline_points_add"); - - if (tmp) { - memmove(nu->bezt, tmp, nu->pntsu * sizeof(BezTriple)); - MEM_freeN(tmp); - } - memset(nu->bezt + nu->pntsu, 0, number * sizeof(BezTriple)); + nu->bezt = MEM_recallocN(nu->bp, (nu->pntsu + number) * sizeof(BezTriple)); - for (i = 0, tmp = nu->bezt + nu->pntsu; i < number; i++, tmp++) { - tmp->radius = 1.0f; + for (i = 0, bezt = &nu->bezt[nu->pntsu]; i < number; i++, bezt++) { + bezt->radius = 1.0f; } nu->pntsu += number; -- cgit v1.2.3