From fa85d937426866652a032f6bab1216f7e5723198 Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Fri, 5 Oct 2018 09:56:39 -0700
Subject: [PATCH] Refactoring

---
 .../Operations/ArrayAdvancedObject3D.cs            |  2 +-
 .../DesignTools/Operations/ArrayLinearObject3D.cs  |  2 +-
 .../DesignTools/Operations/ArrayRadialObject3D.cs  |  2 +-
 .../Operations/OperationSourceObject3D.cs          | 14 +++++++++-----
 Submodules/agg-sharp                               |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs
index 3a1da3d58..8f62976a7 100644
--- a/MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/ArrayAdvancedObject3D.cs
@@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 
 		public override void Flatten(UndoBuffer undoBuffer)
 		{
-			OperationSourceObject3D.Apply(this);
+			OperationSourceObject3D.Flatten(this);
 
 			base.Flatten(undoBuffer);
 		}
diff --git a/MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs
index 76b38a934..79ebdada4 100644
--- a/MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/ArrayLinearObject3D.cs
@@ -51,7 +51,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 
 		public override void Flatten(UndoBuffer undoBuffer)
 		{
-			OperationSourceObject3D.Apply(this);
+			OperationSourceObject3D.Flatten(this);
 
 			base.Flatten(undoBuffer);
 		}
diff --git a/MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs b/MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs
index 2ccc24052..df6ef848b 100644
--- a/MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/ArrayRadialObject3D.cs
@@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 
 		public override void Flatten(UndoBuffer undoBuffer)
 		{
-			OperationSourceObject3D.Apply(this);
+			OperationSourceObject3D.Flatten(this);
 
 			base.Flatten(undoBuffer);
 		}
diff --git a/MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs b/MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs
index 191a342f5..d7664e69e 100644
--- a/MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs
+++ b/MatterControlLib/DesignTools/Operations/OperationSourceObject3D.cs
@@ -76,15 +76,15 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 		}
 
 		/// <summary>
-		/// Do the work of apply for a parent that has a source Operation in it
+		/// Flatten the children of an object that has an OperationSource in it
 		/// </summary>
-		/// <param name="parent"></param>
-		public static void Apply(IObject3D parent)
+		/// <param name="item"></param>
+		public static void Flatten(IObject3D item)
 		{
-			using (parent.RebuildLock())
+			using (item.RebuildLock())
 			{
 				// The idea is we leave everything but the source and that is the applied operation
-				parent.Children.Modify(list =>
+				item.Children.Modify(list =>
 				{
 					var sourceItem = list.FirstOrDefault(c => c is OperationSourceObject3D);
 					if (sourceItem != null)
@@ -108,6 +108,10 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
 			}
 		}
 
+		/// <summary>
+		/// Prepare the children of an object tha contains an OpperationSource to be removed
+		/// </summary>
+		/// <param name="parent"></param>
 		internal static void Remove(IObject3D parent)
 		{
 			using (parent.RebuildLock())
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 335221f34..d498bd6bb 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 335221f3421a0ddd076ef1da63caaed8554a5349
+Subproject commit d498bd6bbd6dd3478f12a8b0368221310ca4b1c6