diff options
| author | Antonioya <blendergit@gmail.com> | 2019-01-21 19:38:47 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-01-21 19:39:00 +0300 |
| commit | 0af8ad51c07f987d8cf449efd95a7068f7edeffa (patch) | |
| tree | b42308c0d23ad4b040603af7be1a41bb633212a7 /source/blender/editors/gpencil/gpencil_edit.c | |
| parent | 2b0fb0d7bfb84cc5d77cdaa2e89c8fd5d8bd5e59 (diff) | |
GP: Fix memory leaks when use cutter with weights
There were some issues when copy the weights and other memory leaks.
Also some code cleanup.
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_edit.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index e81aac3686f..05bd5dd3c1b 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -1843,7 +1843,6 @@ void gp_stroke_delete_tagged_points(bGPDframe *gpf, bGPDstroke *gps, bGPDstroke bool in_island = false; int num_islands = 0; - /* First Pass: Identify start/end of islands */ bGPDspoint *pt = gps->points; for (int i = 0; i < gps->totpoints; i++, pt++) { @@ -1902,13 +1901,14 @@ void gp_stroke_delete_tagged_points(bGPDframe *gpf, bGPDstroke *gps, bGPDstroke /* Copy weights */ int e = island->start_idx; for (int i = 0; i < new_stroke->totpoints; i++) { - MDeformVert *dvert_dst = &gps->dvert[e]; - MDeformVert *dvert_src = &new_stroke->dvert[i]; - dvert_dst->dw = MEM_dupallocN(dvert_src->dw); + MDeformVert *dvert_src = &gps->dvert[e]; + MDeformVert *dvert_dst = &new_stroke->dvert[i]; + if (dvert_src->dw) { + dvert_dst->dw = MEM_dupallocN(dvert_src->dw); + } e++; } } - /* Each island corresponds to a new stroke. We must adjust the * timings of these new strokes: * @@ -1954,17 +1954,8 @@ void gp_stroke_delete_tagged_points(bGPDframe *gpf, bGPDstroke *gps, bGPDstroke MEM_freeN(islands); /* Delete the old stroke */ - if (gps->points) { - MEM_freeN(gps->points); - } - if (gps->dvert) { - BKE_gpencil_free_stroke_weights(gps); - MEM_freeN(gps->dvert); - } - if (gps->triangles) { - MEM_freeN(gps->triangles); - } - BLI_freelinkN(&gpf->strokes, gps); + BLI_remlink(&gpf->strokes, gps); + BKE_gpencil_free_stroke(gps); } /* Split selected strokes into segments, splitting on selected points */ |