[Bf-blender-cvs] [6d6985ff845] greasepencil-object: GP: Support Cutter in same stroke

[Antonioya]

Commit: 6d6985ff8455c86d2a60d8f0407b235aaae69bba
Author: Antonioya
Date:   Mon Jan 7 18:43:49 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB6d6985ff8455c86d2a60d8f0407b235aaae69bba

GP: Support Cutter in same stroke

Before the cutter only worked with different strokes, but now can handle selfcollisions.

Also added code to avoid infinite loops.

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 4ca85ee6e77..1f1a92059d1 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -3922,6 +3922,7 @@ static int gpencil_cutter_lasso_select(
 	GP_EDITABLE_STROKES_BEGIN(gpstroke_iter, C, gpl, gps)
 	{
 		int tot_inside = 0;
+		const int oldtot = gps->totpoints;
 		for (i = 0; i < gps->totpoints; i++) {
 			pt = &gps->points[i];
 			if ((pt->flag & GP_SPOINT_SELECT) || (pt->flag & GP_SPOINT_TAG)) {
@@ -3939,6 +3940,10 @@ static int gpencil_cutter_lasso_select(
 					ED_gpencil_select_stroke_segment(
 						gpl, gps, pt, true, true, scale, r_hita, r_hitb);
 				}
+				/* avoid infinite loops */
+				if (gps->totpoints > oldtot) {
+					break;
+				}
 			}
 		}
 		/* if mark all points inside lasso set to remove all stroke */
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 62fa65e6307..36bb9dbe9de 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -2005,14 +2005,14 @@ void ED_gpencil_update_color_uv(Main *bmain, Material *mat)
 }
 
 static bool gpencil_check_collision(
-	bGPDstroke **gps_array, GHash *all_2d,
+	bGPDstroke *gps, bGPDstroke **gps_array, GHash *all_2d,
 	int totstrokes,	float p2d_a1[2], float p2d_a2[2], float r_hit[2])
 {
 	bool hit = false;
 	/* check segment with all segments of all strokes */
 	for (int s = 0; s < totstrokes; s++) {
 		bGPDstroke *gps_iter = gps_array[s];
-		if (gps_iter->totpoints < 3) {
+		if (gps_iter->totpoints < 2) {
 			continue;
 		}
 		/* get stroke 2d version */
@@ -2023,6 +2023,15 @@ static bool gpencil_check_collision(
 			copy_v2_v2(p2d_b1, points2d[i2]);
 			copy_v2_v2(p2d_b2, points2d[i2 + 1]);
 
+			/* don't self check */
+			if (gps == gps_iter) {
+				if (equals_v2v2(p2d_a1, p2d_b1) || equals_v2v2(p2d_a1, p2d_b2)) {
+					continue;
+				}
+				if (equals_v2v2(p2d_a2, p2d_b1) || equals_v2v2(p2d_a2, p2d_b2)) {
+					continue;
+				}
+			}
 			/* check collision */
 			int check = isect_seg_seg_v2_point(p2d_a1, p2d_a2, p2d_b1, p2d_b2, r_hit);
 			if (check > 0) {
@@ -2164,14 +2173,14 @@ int ED_gpencil_select_stroke_segment(
 		return 0;
 	}
 
-	int memsize = BLI_listbase_count(&gpf->strokes) - 1;
+	int memsize = BLI_listbase_count(&gpf->strokes);
 	bGPDstroke **gps_array = MEM_callocN(sizeof(bGPDstroke *) * memsize, __func__);
 
 	/* Save list of strokes to check */
 	int totstrokes = 0;
 	for (bGPDstroke *gps_iter = gpf->strokes.first; gps_iter; gps_iter = gps_iter->next) {
-		/* do not check selfcollision */
-		if ((gps == gps_iter) || (gps_iter->totpoints < 2)) {
+		
+		if (gps_iter->totpoints < 2) {
 			continue;
 		}
 		gps_array[totstrokes] = gps_iter;
@@ -2208,10 +2217,12 @@ int ED_gpencil_select_stroke_segment(
 		bGPDstroke *gps_iter = gps_array[s];
 		float(*points2d_iter)[2] = MEM_mallocN(sizeof(*points2d_iter) * gps_iter->totpoints, __func__);
 
-		/* the extremes of the stroke are scaled to improve collision detection for near lines */
+		/* the extremes of the stroke are scaled to improve collision detection
+		 * for near lines */
 		BKE_gpencil_stroke_2d_flat_ref(
 			gps->points, gps->totpoints,
-			gps_iter->points, gps_iter->totpoints, points2d_iter, scale, &direction);
+			gps_iter->points, gps_iter->totpoints, points2d_iter,
+			scale, &direction);
 		BLI_ghash_insert(all_2d, gps_iter, points2d_iter);
 	}
 
@@ -2235,7 +2246,7 @@ int ED_gpencil_select_stroke_segment(
 			copy_v2_v2(p2d_a2, points2d[i2]);
 
 			hit_a = gpencil_check_collision(
-				gps_array, all_2d, totstrokes, p2d_a1, p2d_a2, r_hit2d);
+				gps, gps_array, all_2d, totstrokes, p2d_a1, p2d_a2, r_hit2d);
 
 			if (select) {
 				pta1->flag |= GP_SPOINT_SELECT;
@@ -2269,7 +2280,7 @@ int ED_gpencil_select_stroke_segment(
 		copy_v2_v2(p2d_a2, points2d[i2]);
 
 		hit_b = gpencil_check_collision(
-			gps_array, all_2d, totstrokes, p2d_a1, p2d_a2, r_hit2d);
+			gps, gps_array, all_2d, totstrokes, p2d_a1, p2d_a2, r_hit2d);
 
 		if (select) {
 			pta1->flag |= GP_SPOINT_SELECT;