From b73ff7070ccff5cf64b793fc61c298b029bb27da Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 6 May 2022 12:51:53 -0700 Subject: [PATCH 1/3] Default to array combine --- .../PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs | 2 +- Submodules/agg-sharp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs index bcdb210eb..5cc926c37 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs @@ -204,7 +204,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D if (set.Count > 1) { -#if false +#if true setMesh = BooleanProcessing.DoArray(set.Select(i => (i.mesh, i.matrix)), CsgModes.Union, Processing, diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 171deb557..24fd0ee17 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 171deb5573a4497a73bf4497fcaae47d7264e1e1 +Subproject commit 24fd0ee1794410def5744f27520f0a06e5f8e736 From 302cfc620e8f0ffe67d13b5ca6c980960f7c183b Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 6 May 2022 17:19:54 -0700 Subject: [PATCH 2/3] Only load setting that are part of an object that can be printed --- MatterControlLib/ApplicationView/Config/PrinterConfig.cs | 2 +- StaticData/Translations/Master.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/ApplicationView/Config/PrinterConfig.cs b/MatterControlLib/ApplicationView/Config/PrinterConfig.cs index e8a1db6af..1d08a2a07 100644 --- a/MatterControlLib/ApplicationView/Config/PrinterConfig.cs +++ b/MatterControlLib/ApplicationView/Config/PrinterConfig.cs @@ -81,7 +81,7 @@ namespace MatterHackers.MatterControl var foundPartSettings = false; var newSceneOverrides = new PrinterSettingsLayer(); // accumulate all the scene overrides ordered by their names, which is the order they will be in the design tree - foreach (var partSettingsObject in scene.DescendantsAndSelf().Where(c => c is PartSettingsObject3D).OrderBy(i => i.Name)) + foreach (var partSettingsObject in scene.DescendantsAndSelf().Where(c => c is PartSettingsObject3D && c.Parent?.WorldPrintable() == true).OrderBy(i => i.Name)) { foundPartSettings = true; var settings = ((PartSettingsObject3D)partSettingsObject).Overrides; diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 643b62950..586dd5c4a 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -2434,6 +2434,9 @@ Translated:Item cannot be exported English:Item cannot be exported as AMF Translated:Item cannot be exported as AMF +English:Item cannot be exported as MCX +Translated:Item cannot be exported as MCX + English:Item not Found Translated:Item not Found From 97107d895fba4d55535ab8ffcf59753e9f087352 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sat, 7 May 2022 12:29:01 -0700 Subject: [PATCH 3/3] Union now cleans up all co-planer faces correctly --- Submodules/agg-sharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 24fd0ee17..e83b5b6e0 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 24fd0ee1794410def5744f27520f0a06e5f8e736 +Subproject commit e83b5b6e0f0030b24513124d84649e6d05417d2b