source/blender/editors/gpencil/gpencil_select.c

@@ -2039,24 +2039,16 @@ static bool gpencil_generic_stroke_select(bContext *C,
   /* init space conversion stuff */
   gpencil_point_conversion_init(C, &gsc);
 
+  /* Use only object transform matrix because all layer transformations are already included
+   * in the evaluated stroke. */
+  Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
+  Object *ob_eval = depsgraph != NULL ? DEG_get_evaluated_object(depsgraph, ob) : ob;
+  float select_mat[4][4];
+  copy_m4_m4(select_mat, ob_eval->object_to_world);
+
   /* deselect all strokes first? */
-  if (SEL_OP_USE_PRE_DESELECT(sel_op) || GPENCIL_PAINT_MODE(gpd)) {
+  if (SEL_OP_USE_PRE_DESELECT(sel_op)) {
-    /* Set selection index to 0. */
+    deselect_all_selected(C);
-    gpd->select_last_index = 0;
-
-    CTX_DATA_BEGIN (C, bGPDstroke *, gps, editable_gpencil_strokes) {
-      bGPDspoint *pt;
-      int i;
-
-      for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
-        pt->flag &= ~GP_SPOINT_SELECT;
-      }
-
-      gps->flag &= ~GP_STROKE_SELECT;
-      BKE_gpencil_stroke_select_index_reset(gps);
-    }
-    CTX_DATA_END;
-
     changed = true;
   }
 
@@ -2071,9 +2063,9 @@ static bool gpencil_generic_stroke_select(bContext *C,
     for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
       bGPDspoint *pt_active = (pt->runtime.pt_orig) ? pt->runtime.pt_orig : pt;
 
-      /* Convert point coords to screen-space. */
+      /* Convert point coords to screen-space. Needs to use the evaluated point
-      const bool is_inside = is_inside_fn(
+       * to consider modifiers. */
-          gsc.region, gpstroke_iter.diff_mat, &pt_active->x, user_data);
+      const bool is_inside = is_inside_fn(gsc.region, select_mat, &pt->x, user_data);
       if (strokemode == false) {
         const bool is_select = (pt_active->flag & GP_SPOINT_SELECT) != 0;
         const int sel_op_result = ED_select_op_action_deselected(sel_op, is_select, is_inside);