From 5e30d1bc87bd1e5d82a95b4fb638f35a8be0e03e Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Thu, 26 May 2022 15:56:55 -0700
Subject: [PATCH] Making holes apply correctly when parent is set to solid or
 hole

---
 MatterControlLib/DesignTools/Operations/GroupObject3D.cs    | 2 +-
 .../Primitives/OperationSourceContainerObject3D.cs          | 2 +-
 MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs   | 6 +++---
 .../PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs   | 2 +-
 Submodules/agg-sharp                                        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MatterControlLib/DesignTools/Operations/GroupObject3D.cs b/MatterControlLib/DesignTools/Operations/GroupObject3D.cs
index 1682aafc2..d15601647 100644
--- a/MatterControlLib/DesignTools/Operations/GroupObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/GroupObject3D.cs
@@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
             {
 				var selections = new SelectedChildren();
 
-				foreach(var child in SourceContainer.FirstWithMultipleChildrenDescendantsAndSelf().Children.Where(i => i.WorldOutputType(this) == PrintOutputTypes.Hole && !(i is OperationSourceObject3D) ))
+				foreach(var child in SourceContainer.FirstWithMultipleChildrenDescendantsAndSelf().Children.Where(i => i.OutputType == PrintOutputTypes.Hole && !(i is OperationSourceObject3D) ))
                 {
 					selections.Add(child.ID);
                 }
diff --git a/MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs b/MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs
index 5ddd7d5e9..f847c9acd 100644
--- a/MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs
@@ -340,7 +340,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 				if (keepItems.Any())
 				{
 					// apply any holes before we return
-					var resultItems = SubtractObject3D_2.DoSubtract(null,
+					var resultItems = SubtractObject3D_2.DoSubtract(this,
 						keepItems,
 						removeItems,
 						reporter,
diff --git a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
index 5d6f4bf35..f0643c9c1 100644
--- a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
+++ b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
@@ -326,7 +326,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				var scaledButtonSize = 24 * GuiWidget.DeviceScale;
 				void SetButtonStates()
 				{
-                    switch (selectedItem.WorldOutputType())
+                    switch (selectedItem.OutputType)
                     {
                         case PrintOutputTypes.Hole:
 							holeContainer.BackgroundOutlineWidth = 1;
@@ -381,7 +381,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 							break;
 					}
 
-					var currentOutputType = selectedItem.WorldOutputType();
+					var currentOutputType = selectedItem.OutputType;
 					if (currentOutputType != PrintOutputTypes.Solid && currentOutputType != PrintOutputTypes.Default)
 					{
 						undoBuffer.AddAndDo(new ChangeColor(selectedItem, colorField.Color));
@@ -453,7 +453,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 				void SetToHole()
                 {
-					if (selectedItem.WorldOutputType() != PrintOutputTypes.Hole)
+					if (selectedItem.OutputType != PrintOutputTypes.Hole)
 					{
 						undoBuffer.AddAndDo(new MakeHole(selectedItem));
 					}
diff --git a/MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs
index 6ce6bc2f6..23b73f421 100644
--- a/MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs
+++ b/MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs
@@ -162,7 +162,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
 
                     if (resultsMesh != null)
                     {
-                        var resultItems = SubtractObject3D_2.DoSubtract(null,
+                        var resultItems = SubtractObject3D_2.DoSubtract(this,
                             new List<IObject3D>() { resultsItem },
                             new List<IObject3D>() { holesItem },
                             null,
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 6d5ec9c6a..9bab0f3b9 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 6d5ec9c6abe7234e0951a3a1b9fc36eadab2d987
+Subproject commit 9bab0f3b95279a55dd575a126252e1ad7eb8562d