[Bf-blender-cvs] [8b4f318f925] greasepencil-edit-curve: GPencil: Fix error and warnings after merge

[Antonio Vazquez]

Commit: 8b4f318f92509a9d4b6a20a3b47ae06045c8d007
Author: Antonio Vazquez
Date:   Sat Aug 15 11:55:59 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB8b4f318f92509a9d4b6a20a3b47ae06045c8d007

GPencil: Fix error and warnings after merge

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

M	source/blender/blenkernel/intern/gpencil_curve.c

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

diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c
index 881ce019d32..d40ea7fb3e1 100644
--- a/source/blender/blenkernel/intern/gpencil_curve.c
+++ b/source/blender/blenkernel/intern/gpencil_curve.c
@@ -305,6 +305,7 @@ static void gpencil_convert_spline(Main *bmain,
                                    bGPDframe *gpf,
                                    Nurb *nu)
 {
+  bGPdata *gpd = (bGPdata *)ob_gp->data;
   bool cyclic = true;
 
   /* Create Stroke. */
@@ -455,7 +456,7 @@ static void gpencil_convert_spline(Main *bmain,
   }
 
   if (sample > 0.0f) {
-    BKE_gpencil_stroke_sample(gps, sample, false);
+    BKE_gpencil_stroke_sample(gpd, gps, sample, false);
   }
 
   /* Recalc fill geometry. */
@@ -1006,12 +1007,12 @@ void BKE_gpencil_stroke_update_geometry_from_editcurve(bGPDstroke *gps,
     }
 
     bGPDspoint *pt = &gps->points[0];
-    copy_v3_v3(&pt->x, &cpt->bezt.vec[0]);
+    copy_v3_v3(&pt->x, cpt->bezt.vec[0]);
 
     pt->pressure = cpt->pressure;
     pt->strength = cpt->strength;
 
-    copy_v4_v4(pt->vert_color, &cpt->vert_color);
+    copy_v4_v4(pt->vert_color, cpt->vert_color);
 
     /* deselect */
     pt->flag &= ~GP_SPOINT_SELECT;