4 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index b9dba991d64..5cfdcf241d1 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -103,9 +103,8 @@ void BKE_gpencil_batch_cache_free(struct bGPdata *gpd);
 
 void BKE_gpencil_stroke_sync_selection(struct bGPdata *gpd, struct bGPDstroke *gps);
 void BKE_gpencil_curve_sync_selection(struct bGPdata *gpd, struct bGPDstroke *gps);
-void BKE_gpencil_stroke_select_index_set(struct bGPdata *gpd,
-                                         struct bGPDstroke *gps,
-                                         const bool reset);
+void BKE_gpencil_stroke_select_index_set(struct bGPdata *gpd, struct bGPDstroke *gps);
+void BKE_gpencil_stroke_select_index_reset(struct bGPDstroke *gps);
 
 struct bGPDframe *BKE_gpencil_frame_addnew(struct bGPDlayer *gpl, int cframe);
 struct bGPDframe *BKE_gpencil_frame_addcopy(struct bGPDlayer *gpl, int cframe);
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 4167f60e880..28477e9dc30 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1148,7 +1148,7 @@ void BKE_gpencil_stroke_sync_selection(bGPdata *gpd, bGPDstroke *gps)
    * so initially, we must deselect
    */
   gps->flag &= ~GP_STROKE_SELECT;
-  BKE_gpencil_stroke_select_index_set(NULL, gps, true);
+  BKE_gpencil_stroke_select_index_reset(gps);
 
   for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
     if (pt->flag & GP_SPOINT_SELECT) {
@@ -1158,7 +1158,7 @@ void BKE_gpencil_stroke_sync_selection(bGPdata *gpd, bGPDstroke *gps)
   }
 
   if (gps->flag & GP_STROKE_SELECT) {
-    BKE_gpencil_stroke_select_index_set(gpd, gps, false);
+    BKE_gpencil_stroke_select_index_set(gpd, gps);
   }
 }
 
@@ -1170,7 +1170,7 @@ void BKE_gpencil_curve_sync_selection(bGPdata *gpd, bGPDstroke *gps)
   }
 
   gps->flag &= ~GP_STROKE_SELECT;
-  BKE_gpencil_stroke_select_index_set(NULL, gps, true);
+  BKE_gpencil_stroke_select_index_reset(gps);
   gpc->flag &= ~GP_CURVE_SELECT;
 
   bool is_selected = false;
@@ -1193,20 +1193,21 @@ void BKE_gpencil_curve_sync_selection(bGPdata *gpd, bGPDstroke *gps)
   if (is_selected) {
     gpc->flag |= GP_CURVE_SELECT;
     gps->flag |= GP_STROKE_SELECT;
-    BKE_gpencil_stroke_select_index_set(gpd, gps, false);
+    BKE_gpencil_stroke_select_index_set(gpd, gps);
   }
 }
 
 /* Assign unique stroke ID for selection. */
-void BKE_gpencil_stroke_select_index_set(bGPdata *gpd, bGPDstroke *gps, const bool reset)
+void BKE_gpencil_stroke_select_index_set(bGPdata *gpd, bGPDstroke *gps)
 {
-  if (!reset) {
-    gpd->select_last_index++;
-    gps->select_index = gpd->select_last_index;
-  }
-  else {
-    gps->select_index = 0;
-  }
+  gpd->select_last_index++;
+  gps->select_index = gpd->select_last_index;
+}
+
+/* Reset unique stroke ID for selection. */
+void BKE_gpencil_stroke_select_index_reset(bGPDstroke *gps)
+{
+  gps->select_index = 0;
 }
 
 /* ************************************************** */
@@ -2533,7 +2534,7 @@ bool BKE_gpencil_from_image(
       }
 
       if (gps->flag & GP_STROKE_SELECT) {
-        BKE_gpencil_stroke_select_index_set(gpd, gps, false);
+        BKE_gpencil_stroke_select_index_set(gpd, gps);
       }
 
       BKE_gpencil_stroke_geometry_update(gpd, gps);
diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c
index a1cae205d39..88d3e917a7a 100644
--- a/source/blender/blenkernel/intern/gpencil_curve.c
+++ b/source/blender/blenkernel/intern/gpencil_curve.c
@@ -814,7 +814,7 @@ void BKE_gpencil_stroke_editcurve_sync_selection(bGPdata *gpd, bGPDstroke *gps,
 {
   if (gpc->flag & GP_CURVE_SELECT) {
     gps->flag |= GP_STROKE_SELECT;
-    BKE_gpencil_stroke_select_index_set(gpd, gps, false);
+    BKE_gpencil_stroke_select_index_set(gpd, gps);
 
     for (int i = 0; i < gpc->tot_curve_points - 1; i++) {
       bGPDcurve_point *gpc_pt = &gpc->curve_points[i];
@@ -868,7 +868,7 @@ void BKE_gpencil_stroke_editcurve_sync_selection(bGPdata *gpd, bGPDstroke *gps,
   }
   else {
     gps->flag &= ~GP_STROKE_SELECT;
-    BKE_gpencil_stroke_select_index_set(NULL, gps, true);
+    BKE_gpencil_stroke_select_index_reset(gps);
     for (int i = 0; i < gps->totpoints; i++) {
       bGPDspoint *pt = &gps->points[i];
       pt->flag &= ~GP_SPOINT_SELECT;
@@ -1093,7 +1093,7 @@ void BKE_gpencil_stroke_update_geometry_from_editcurve(bGPDstroke *gps,
     /* deselect */
     pt->flag &= ~GP_SPOINT_SELECT;
     gps->flag &= ~GP_STROKE_SELECT;
-    BKE_gpencil_stroke_select_index_set(NULL, gps, true);
+    BKE_gpencil_stroke_select_index_reset(gps);
 
     return;
   }
@@ -1136,7 +1136,7 @@ void BKE_gpencil_stroke_update_geometry_from_editcurve(bGPDstroke *gps,
     pt->flag &= ~GP_SPOINT_SELECT;
   }
   gps->flag &= ~GP_STROKE_SELECT;
-  BKE_gpencil_stroke_select_index_set(NULL, gps, true);
+  BKE_gpencil_stroke_select_index_reset(gps);
 
   /* free temp data */
   MEM_freeN(points);
diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c
index 2d10645a467..8c4882854d1 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@ -3444,7 +3444,7 @@ void BKE_gpencil_stroke_uniform_subdivide(bGPdata *gpd,
 
   if (select) {
     gps->flag |= GP_STROKE_SELECT;
-    BKE_gpencil_stroke_select_index_set(gpd, gps, false);
+    BKE_gpencil_stroke_select_index_set(gpd, gps);
   }
 
   /* Free the sample points. Important to use the mutable loop here because we are erasing the list