[Bf-blender-cvs] [c1c7df1c9c2] experimental_gp_weight: Move dupalloc outside duplicate function
Antonio Vazquez
noreply at git.blender.org
Tue May 15 18:34:22 CEST 2018
Commit: c1c7df1c9c2c36c5e651c7d17ada38a7a222ef5c
Author: Antonio Vazquez
Date: Tue May 15 18:34:11 2018 +0200
Branches: experimental_gp_weight
https://developer.blender.org/rBc1c7df1c9c2c36c5e651c7d17ada38a7a222ef5c
Move dupalloc outside duplicate function
===================================================================
M source/blender/blenkernel/intern/gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index d06bf261ed3..f2c6a1ea5a4 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -542,8 +542,6 @@ void BKE_gpencil_stroke_weights_duplicate(bGPDstroke *gps_src, bGPDstroke *gps_d
}
BLI_assert(gps_src->totpoints == gps_dst->totpoints);
- gps_dst->dvert = MEM_dupallocN(gps_src->dvert);
-
for (int i = 0; i < gps_src->totpoints; i++) {
MDeformVert *dvert_dst = &gps_dst->dvert[i];
MDeformVert *dvert_src = &gps_src->dvert[i];
@@ -560,6 +558,8 @@ bGPDstroke *BKE_gpencil_stroke_duplicate(bGPDstroke *gps_src)
gps_dst->prev = gps_dst->next = NULL;
gps_dst->points = MEM_dupallocN(gps_src->points);
+
+ gps_dst->dvert = MEM_dupallocN(gps_src->dvert);
BKE_gpencil_stroke_weights_duplicate(gps_src, gps_dst);
/* Don't clear triangles, so that modifier evaluation can just use
More information about the Bf-blender-cvs
mailing list