Commit: 0dc59490ecaa9bb0e80e4f3b4ec563876fd30674 Author: dilithjay Date: Fri Nov 5 17:57:57 2021 +0530 Branches: soc-2021-curves https://developer.blender.org/rB0dc59490ecaa9bb0e80e4f3b4ec563876fd30674
Fixed ASAN issue (memcpy-param-overlap): Switched from memcpy to memmove =================================================================== M release/datafiles/locale M release/scripts/addons M source/blender/editors/curve/editcurve_pen.c M source/tools =================================================================== diff --git a/release/datafiles/locale b/release/datafiles/locale index 8ee2942570f..78b4e0c9a51 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit 8ee2942570f08d10484bb2328d0d1b0aaaa0367c +Subproject commit 78b4e0c9a513650b961826aeeafc324487f5e1aa diff --git a/release/scripts/addons b/release/scripts/addons index f2a08d80ccd..6274264545c 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit f2a08d80ccd3c13af304525778df3905f95bd44d +Subproject commit 6274264545c61a74e6093b0243e9b973dcd50d19 diff --git a/source/blender/editors/curve/editcurve_pen.c b/source/blender/editors/curve/editcurve_pen.c index 5ff6d201550..e058524518c 100644 --- a/source/blender/editors/curve/editcurve_pen.c +++ b/source/blender/editors/curve/editcurve_pen.c @@ -214,7 +214,7 @@ static void delete_bezt_from_nurb(const BezTriple *bezt, Nurb *nu) BLI_assert(nu->type == CU_BEZIER); int index = BKE_curve_nurb_vert_index_get(nu, bezt); nu->pntsu -= 1; - memcpy(nu->bezt + index, nu->bezt + index + 1, (nu->pntsu - index) * sizeof(BezTriple)); + memmove(nu->bezt + index, nu->bezt + index + 1, (nu->pntsu - index) * sizeof(BezTriple)); } static void delete_bp_from_nurb(const BPoint *bp, Nurb *nu) @@ -222,7 +222,7 @@ static void delete_bp_from_nurb(const BPoint *bp, Nurb *nu) BLI_assert(nu->type == CU_NURBS || nu->type == CU_POLY); int index = BKE_curve_nurb_vert_index_get(nu, bp); nu->pntsu -= 1; - memcpy(nu->bp + index, nu->bp + index + 1, (nu->pntsu - index) * sizeof(BPoint)); + memmove(nu->bp + index, nu->bp + index + 1, (nu->pntsu - index) * sizeof(BPoint)); } /* Get the closest point on an edge to a given point based on perpendicular distance. Return true diff --git a/source/tools b/source/tools index 2e8c8792488..cc857792a49 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit 2e8c879248822c8e500ed49d79acc605e5aa75b9 +Subproject commit cc857792a49b4b9cab51f185803cdecdaa10e6eb _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
