diff --git a/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs index 25f44646a..abf74c4dd 100644 --- a/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/LinearExtrudeObject3D.cs @@ -157,6 +157,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations if (childPaths != null) { + childPaths = childPaths.Union(childPaths); Mesh = VertexSourceToMesh.Extrude(childPaths, height, bevel, InflatePathObject3D.GetJoinType(Style)); if (Mesh.Vertices.Count == 0) { diff --git a/MatterControlLib/DesignTools/Operations/Path/MergePathObject3D.cs b/MatterControlLib/DesignTools/Operations/Path/MergePathObject3D.cs index 2f5594bd7..c01001a24 100644 --- a/MatterControlLib/DesignTools/Operations/Path/MergePathObject3D.cs +++ b/MatterControlLib/DesignTools/Operations/Path/MergePathObject3D.cs @@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations } var first = participants.First(); - var resultsVertexSource = first.GetVertexSource().Transform(first.Matrix); + var resultsVertexSource = first.GetVertexSource().Transform(first.WorldMatrix(this)); var totalOperations = participants.Count() - 1; double amountPerOperation = 1.0 / totalOperations; @@ -140,7 +140,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations if (item != first && item.GetVertexSource() != null) { - var itemVertexSource = item.GetVertexSource().Transform(item.Matrix); + var itemVertexSource = item.GetVertexSource().Transform(item.WorldMatrix(this)); resultsVertexSource = resultsVertexSource.MergePaths(itemVertexSource, clipType); diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 811c4a968..6186fc39e 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -1441,6 +1441,9 @@ Translated:Distance or Loops English:Do CSG Translated:Do CSG +English:Do Subtract +Translated:Do Subtract + English:Documents Translated:Documents diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index f70077c6a..a05d2c24e 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit f70077c6a25aff063ff31628ced66e19c2ab62df +Subproject commit a05d2c24e5e73ded25fd54606c859fcc29cc3a6b