[Bf-blender-cvs] [f1d0c41dcfd] greasepencil-object: Add missing weight data management in RNA function

[Antonio Vazquez]

Commit: f1d0c41dcfd6bde93ff62d2d25ccc7531a0a42a8
Author: Antonio Vazquez
Date:   Mon Jul 16 10:01:28 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf1d0c41dcfd6bde93ff62d2d25ccc7531a0a42a8

Add missing weight data management in RNA function

This code was missing in the initial fix.

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

M       source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/source/blender/makesrna/intern/rna_gpencil.c 
b/source/blender/makesrna/intern/rna_gpencil.c
index 7b23ec1b622..ebda00e47a1 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -460,6 +460,7 @@ static void rna_GPencil_stroke_point_add(bGPDstroke 
*stroke, int count, float pr
 static void rna_GPencil_stroke_point_pop(bGPDstroke *stroke, ReportList 
*reports, int index)
 {
        bGPDspoint *pt_tmp = stroke->points;
+       MDeformVert *pt_dvert = stroke->dvert;
 
        /* python style negative indexing */
        if (index < 0) {
@@ -476,15 +477,26 @@ static void rna_GPencil_stroke_point_pop(bGPDstroke 
*stroke, ReportList *reports
        stroke->points = MEM_callocN(sizeof(bGPDspoint) * stroke->totpoints, 
"gp_stroke_points");
        stroke->dvert = MEM_callocN(sizeof(MDeformVert) * stroke->totpoints, 
"gp_stroke_weights");
 
-       if (index > 0)
+       if (index > 0) {
                memcpy(stroke->points, pt_tmp, sizeof(bGPDspoint) * index);
+               /* verify weight data is available */
+               if (pt_dvert != NULL) {
+                       memcpy(stroke->dvert, pt_dvert, sizeof(MDeformVert) * 
index);
+               }
+       }
 
-       if (index < stroke->totpoints)
+       if (index < stroke->totpoints) {
                memcpy(&stroke->points[index], &pt_tmp[index + 1], 
sizeof(bGPDspoint) * (stroke->totpoints - index));
-       // TODO: vgroup
+               if (pt_dvert != NULL) {
+                       memcpy(&stroke->dvert[index], &pt_dvert[index + 1], 
sizeof(MDeformVert) * (stroke->totpoints - index));
+               }
+       }
 
        /* free temp buffer */
        MEM_freeN(pt_tmp);
+       if (pt_dvert != NULL) {
+               MEM_freeN(pt_dvert);
+       }
 
        WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs