nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding more cancelation

Browse source
This commit is contained in:
Lars Brubaker 2021-11-23 08:57:50 -08:00
parent 3fb8e54774
commit ee520ce88c
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MatterControl.MeshOperations/CsgBySlicing.cs
View file

@ -99,7 +99,6 @@ namespace MatterHackers.PolygonMesh
var matrix = SliceLayer.GetTransformTo0Plane(plane);
transformTo0Planes[plane] = (matrix, matrix.Inverted);
}
}
public Mesh Calculate(CsgModes operation,
@ -118,6 +117,11 @@ namespace MatterHackers.PolygonMesh
{
var mesh1 = transformedMeshes[mesh1Index];
if (cancellationToken.IsCancellationRequested)
{
return null;
}
for (int faceIndex = 0; faceIndex < mesh1.Faces.Count; faceIndex++)
{
var face = mesh1.Faces[faceIndex];

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 66f77f1cd52f85b7ac3ac6b8e711ad01f32519c5
Subproject commit 6a55bf6267d1d178666d1fda16f97a5beaeb8f5b