[Bf-blender-cvs] [6f0f441b9f2] greasepencil-edit-curve: GPencil: Fix crash, pointer to BezTriple was set wrong

[Falk David]

Commit: 6f0f441b9f24ab816c6856e9bffcaa45682df64f
Author: Falk David
Date:   Fri Jun 12 21:13:00 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB6f0f441b9f24ab816c6856e9bffcaa45682df64f

GPencil: Fix crash, pointer to BezTriple was set wrong

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

M	source/blender/draw/intern/draw_cache_impl_gpencil.c
M	source/blender/editors/gpencil/gpencil_select.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil.c b/source/blender/draw/intern/draw_cache_impl_gpencil.c
index dd0cce89297..c5f2701ace6 100644
--- a/source/blender/draw/intern/draw_cache_impl_gpencil.c
+++ b/source/blender/draw/intern/draw_cache_impl_gpencil.c
@@ -776,7 +776,7 @@ static void gpencil_edit_curve_stroke_iter_cb(bGPDlayer *gpl,
   gpEditCurveVert *vert_ptr = iter->verts + v;
 
   for (int i = 0; i < editcurve->tot_curve_points; i++) {
-    BezTriple *bezt = &editcurve->curve_points[i];
+    BezTriple *bezt = &editcurve->curve_points[i].bezt;
     const bool handle_selected = BEZT_ISSEL_ANY(bezt);
     const char vflag[3] = {
         gpencil_beztriple_vflag_get(bezt->f1, bezt->h1, true, handle_selected),
diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c
index a913e29053d..9bb8296a6df 100644
--- a/source/blender/editors/gpencil/gpencil_select.c
+++ b/source/blender/editors/gpencil/gpencil_select.c
@@ -232,7 +232,7 @@ static int gpencil_select_linked_exec(bContext *C, wmOperator *op)
       if (gps->editcurve != NULL && gps->flag & GP_STROKE_SELECT) {
         bGPDcurve *gpc = gps->editcurve;
         for (int i = 0; i < gpc->tot_curve_points; i++) {
-          BezTriple *bezt = &gpc->curve_points[i];
+          BezTriple *bezt = &gpc->curve_points[i].bezt;
           BEZT_SEL_ALL(bezt);
         }
       }
@@ -709,7 +709,6 @@ static int gpencil_select_more_exec(bContext *C, wmOperator *UNUSED(op))
     GP_EDITABLE_STROKES_BEGIN (gp_iter, C, gpl, gps) {
       if (gps->editcurve != NULL && gps->flag & GP_STROKE_SELECT) {
         bGPDcurve *editcurve = gps->editcurve;
-        BezTriple *bezt;
         int i;
 
         /* First Pass: Go in forward order,
@@ -717,7 +716,8 @@ static int gpencil_select_more_exec(bContext *C, wmOperator *UNUSED(op))
          * - This pass covers the "after" edges of selection islands
          */
         bool prev_sel = false;
-        for (i = 0, bezt = editcurve->curve_points; i < editcurve->tot_curve_points; i++, bezt++) {
+        for (i = 0; i < editcurve->tot_curve_points; i++) {
+          BezTriple *bezt = &editcurve->curve_points[i].bezt;
           if (bezt->f2 & SELECT) {
             /* selected point - just set flag for next point */
             prev_sel = true;
@@ -735,7 +735,8 @@ static int gpencil_select_more_exec(bContext *C, wmOperator *UNUSED(op))
          * - This pass covers the "before" edges of selection islands
          */
         prev_sel = false;
-        for (bezt -= 1; i > 0; i--, bezt--) {
+        for (i = editcurve->tot_curve_points - 1; i > 0; i--) {
+          BezTriple *bezt = &editcurve->curve_points[i].bezt;
           if (bezt->f2 & SELECT) {
             prev_sel = true;
           }
@@ -842,11 +843,11 @@ static int gpencil_select_less_exec(bContext *C, wmOperator *UNUSED(op))
     GP_EDITABLE_STROKES_BEGIN (gp_iter, C, gpl, gps) {
       if (gps->editcurve != NULL && gps->flag & GP_STROKE_SELECT) {
         bGPDcurve *editcurve = gps->editcurve;
-        BezTriple *bezt;
         int i;
 
         bool prev_sel = false;
-        for (i = 0, bezt = editcurve->curve_points; i < editcurve->tot_curve_points; i++, bezt++) {
+        for (i = 0; i < editcurve->tot_curve_points; i++) {
+          BezTriple *bezt = &editcurve->curve_points[i].bezt;
           if (bezt->f2 & SELECT) {
             /* shrink if previous wasn't selected */
             if (prev_sel == false) {
@@ -864,7 +865,8 @@ static int gpencil_select_less_exec(bContext *C, wmOperator *UNUSED(op))
          * - This pass covers the "before" edges of selection islands
          */
         prev_sel = false;
-        for (bezt -= 1; i > 0; i--, bezt--) {
+        for (i = editcurve->tot_curve_points - 1; i > 0; i--) {
+          BezTriple *bezt = &editcurve->curve_points[i].bezt;
           if (bezt->f2 & SELECT) {
             /* shrink if previous wasn't selected */
             if (prev_sel == false) {