[Bf-blender-cvs] [da40d91d468] greasepencil-edit-curve: GPencil: Fix compiler errors due merge conflicts

[Antonio Vazquez]

Commit: da40d91d468f0491ed562efc99144f5a9ec15856
Author: Antonio Vazquez
Date:   Mon Nov 9 19:56:21 2020 +0100
Branches: greasepencil-edit-curve
https://developer.blender.org/rBda40d91d468f0491ed562efc99144f5a9ec15856

GPencil: Fix compiler errors due merge conflicts

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

M	source/blender/editors/gpencil/gpencil_edit.c

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 57499e83367..373fba35ac0 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -3155,7 +3155,7 @@ static int gpencil_snap_to_grid(bContext *C, wmOperator *UNUSED(op))
   Scene *scene = CTX_data_scene(C);
   Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
   Object *obact = CTX_data_active_object(C);
-  const float gridf = ED_view3d_grid_view_scale(scene, v3d, rv3d, NULL);
+  const float gridf = ED_view3d_grid_view_scale(scene, v3d, region, NULL);
   const bool is_curve_edit = (bool)GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd);
 
   bool changed = false;
@@ -4146,7 +4146,7 @@ static int gpencil_stroke_join_exec(bContext *C, wmOperator *op)
   elem->used = true;
 
   /* Create a new stroke. */
-  bGPDstroke *gps_new = BKE_gpencil_stroke_duplicate(elem->gps, true);
+  bGPDstroke *gps_new = BKE_gpencil_stroke_duplicate(elem->gps, true, true);
   gps_new->flag &= ~GP_STROKE_CYCLIC;
   BLI_insertlinkbefore(&elem->gpf->strokes, elem->gps, gps_new);
 
@@ -4163,7 +4163,7 @@ static int gpencil_stroke_join_exec(bContext *C, wmOperator *op)
   }
 
   /* Calc geometry data for new stroke. */
-  BKE_gpencil_stroke_geometry_update(gps_new);
+  BKE_gpencil_stroke_geometry_update(gpd, gps_new);
 
   /* If join only, delete old strokes. */
   if (type == GP_STROKE_JOIN) {