[Bf-blender-cvs] [71ef45f142b] soc-2021-curves: Removed unnecessary memory allocation when deleting a point

dilithjay noreply at git.blender.org
Sun Jun 27 13:55:07 CEST 2021


Commit: 71ef45f142b3efc2fd1032ce0e92ec4abdacc1ed
Author: dilithjay
Date:   Sun Jun 27 17:24:44 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB71ef45f142b3efc2fd1032ce0e92ec4abdacc1ed

Removed unnecessary memory allocation when deleting a point

===================================================================

M	source/blender/editors/curve/editcurve_pen.c

===================================================================

diff --git a/source/blender/editors/curve/editcurve_pen.c b/source/blender/editors/curve/editcurve_pen.c
index 806ff3cbe58..336ee8e94fb 100644
--- a/source/blender/editors/curve/editcurve_pen.c
+++ b/source/blender/editors/curve/editcurve_pen.c
@@ -205,12 +205,7 @@ static void delete_bezt_from_nurb(BezTriple *bezt, Nurb *nu)
   BLI_assert(nu->type == CU_BEZIER);
   int index = BKE_curve_nurb_vert_index_get(nu, bezt);
   nu->pntsu -= 1;
-  BezTriple *bezt1 = (BezTriple *)MEM_mallocN(nu->pntsu * sizeof(BezTriple), "NewBeztCurve");
-  memcpy(bezt1, nu->bezt, index * sizeof(BezTriple));
-  memcpy(bezt1 + index, nu->bezt + index + 1, (nu->pntsu - index) * sizeof(BezTriple));
-
-  MEM_freeN(nu->bezt);
-  nu->bezt = bezt1;
+  memcpy(nu->bezt + index, nu->bezt + index + 1, (nu->pntsu - index) * sizeof(BezTriple));
 }
 
 /* Delete given BPoint from given Nurb. */
@@ -219,12 +214,7 @@ static void delete_bp_from_nurb(BPoint *bp, Nurb *nu)
   BLI_assert(nu->type == CU_NURBS);
   int index = BKE_curve_nurb_vert_index_get(nu, bp);
   nu->pntsu -= 1;
-  BPoint *bp1 = (BPoint *)MEM_mallocN(nu->pntsu * sizeof(BPoint), "NewBpCurve");
-  memcpy(bp1, nu->bp, index * sizeof(BPoint));
-  memcpy(bp1 + index, nu->bp + index + 1, (nu->pntsu - index) * sizeof(BPoint));
-
-  MEM_freeN(nu->bp);
-  nu->bp = bp1;
+  memcpy(nu->bp + index, nu->bp + index + 1, (nu->pntsu - index) * sizeof(BPoint));
 }
 
 /* Get a measure of how zoomed in the current view is. */



More information about the Bf-blender-cvs mailing list