[Bf-blender-cvs] [028b3a9ba16] greasepencil-object: GPencil: Fix compiler errors after merge

[Antonio Vazquez]

Commit: 028b3a9ba16c46422c97e48e48064b5d0308186d
Author: Antonio Vazquez
Date:   Fri Nov 13 22:14:48 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB028b3a9ba16c46422c97e48e48064b5d0308186d

GPencil: Fix compiler errors after merge

Some functions parameter list changed

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

M	source/blender/blenkernel/BKE_gpencil_geom.h
M	source/blender/blenkernel/intern/gpencil_geom.c
M	source/blender/io/gpencil/intern/gpencil_io_export_svg.cc

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

diff --git a/source/blender/blenkernel/BKE_gpencil_geom.h b/source/blender/blenkernel/BKE_gpencil_geom.h
index 5f203da627c..a1a5cf4e155 100644
--- a/source/blender/blenkernel/BKE_gpencil_geom.h
+++ b/source/blender/blenkernel/BKE_gpencil_geom.h
@@ -149,7 +149,7 @@ void BKE_gpencil_stroke_from_view_space(struct RegionView3D *rv3d,
                                         struct bGPDstroke *gps,
                                         float diff_mat[4][4]);
 struct bGPDstroke *BKE_gpencil_stroke_perimeter_from_view(struct RegionView3D *rv3d,
-                                                          const struct bGPdata *gpd,
+                                                          struct bGPdata *gpd,
                                                           const struct bGPDlayer *gpl,
                                                           struct bGPDstroke *gps,
                                                           int subdivisions,
diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c
index 6471a3c32d9..eaad8e4a1b3 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -3104,7 +3104,7 @@ static ListBase *gpencil_stroke_perimeter_ex(const bGPdata *gpd,
  * \return: bGPDstroke pointer to stroke perimeter
  */
 bGPDstroke *BKE_gpencil_stroke_perimeter_from_view(struct RegionView3D *rv3d,
-                                                   const bGPdata *gpd,
+                                                   bGPdata *gpd,
                                                    const bGPDlayer *gpl,
                                                    bGPDstroke *gps,
                                                    int subdivisions,
@@ -3113,7 +3113,7 @@ bGPDstroke *BKE_gpencil_stroke_perimeter_from_view(struct RegionView3D *rv3d,
   if (gps->totpoints == 0) {
     return NULL;
   }
-  bGPDstroke *gps_temp = BKE_gpencil_stroke_duplicate(gps, true);
+  bGPDstroke *gps_temp = BKE_gpencil_stroke_duplicate(gps, true, false);
 
   BKE_gpencil_stroke_to_view_space(rv3d, gps_temp, diff_mat);
   int num_perimeter_points = 0;
@@ -3150,7 +3150,7 @@ bGPDstroke *BKE_gpencil_stroke_perimeter_from_view(struct RegionView3D *rv3d,
   MEM_freeN(perimeter_points);
 
   /* triangles cache needs to be recalculated */
-  BKE_gpencil_stroke_geometry_update(perimeter_stroke);
+  BKE_gpencil_stroke_geometry_update(gpd, perimeter_stroke);
 
   perimeter_stroke->flag |= GP_STROKE_SELECT | GP_STROKE_CYCLIC;
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
index 0f5b12200e1..a477157ef41 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -252,7 +252,7 @@ void GpencilExporterSVG::export_gpencil_layers(void)
           continue;
         }
         /* Duplicate the stroke to apply any layer thickness change. */
-        bGPDstroke *gps_duplicate = BKE_gpencil_stroke_duplicate(gps, true);
+        bGPDstroke *gps_duplicate = BKE_gpencil_stroke_duplicate(gps, true, false);
 
         gps_current_set(ob, gps_duplicate, true);
 
@@ -287,7 +287,7 @@ void GpencilExporterSVG::export_gpencil_layers(void)
 
               /* Sample stroke. */
               if (params_.stroke_sample > 0.0f) {
-                BKE_gpencil_stroke_sample(gps_perimeter, params_.stroke_sample, false);
+                BKE_gpencil_stroke_sample(gpd_eval, gps_perimeter, params_.stroke_sample, false);
               }
 
               export_stroke_to_path(gpl_node, false);
@@ -440,7 +440,7 @@ void GpencilExporterSVG::export_stroke_to_polyline(pugi::xml_node gpl_node, cons
   }
 
   /* Get the thickness in pixels using a simple 1 point stroke. */
-  bGPDstroke *gps_temp = BKE_gpencil_stroke_duplicate(gps, false);
+  bGPDstroke *gps_temp = BKE_gpencil_stroke_duplicate(gps, false, false);
   gps_temp->totpoints = 1;
   gps_temp->points = (bGPDspoint *)MEM_callocN(sizeof(bGPDspoint), "gp_stroke_points");
   bGPDspoint *pt_src = &gps->points[0];