Projects >> SliceAndDaid >>5ef866faf7cb2bb40d9d3201fddcb95fe236c1dc

Chunk
Conflicting content
	{
		for (Segment2D s : poly)
		{
<<<<<<< HEAD
			if (s.getNormal().dot(s.next.getNormal()) > CraftConfig.joinMinCosAngle)
			{
				removeModelSegment(s);
				Segment2D next = s.next;
				modelSegmentTree.remove(next);
				poly.remove(s);
				modelSegmentTree.insert(next);
			}
		}
		for (Segment2D s : poly)
		{
			if (s.end.sub(s.start).vSize2() < CraftConfig.minSegmentLength * CraftConfig.minSegmentLength)
=======
			//TODO: This sometimes hangs...
			/*
			if (s.normal.dot(s.next.normal) > CraftConfig.joinMinCosAngle)
>>>>>>> 5ba58fe67cc971402dc6df21adfbebcd070ee875
			{
				removeModelSegment(s);
				Segment2D next = s.next;
Solution content
		}
	{
		for (Segment2D s : poly)
		{
			if (s.getNormal().dot(s.next.getNormal()) > CraftConfig.joinMinCosAngle)
			{
				removeModelSegment(s);
				Segment2D next = s.next;
				modelSegmentTree.remove(next);
				poly.remove(s);
				modelSegmentTree.insert(next);
			}
		modelPart.addPolygon(poly);
	}
}
File
Layer.java
Developer's decision
Manual
Kind of conflict
Comment
For statement
If statement