From 393f3b9e9c734fc367a36fe1fbf352f7114dfdc7 Mon Sep 17 00:00:00 2001
From: MatterHackers <larsbrubaker@gmail.com>
Date: Mon, 27 Mar 2023 08:41:34 -0700
Subject: [PATCH] more generic public property editor

---
 .../Primitives/ComponentObject3D.cs            |  3 ++-
 .../DesignTools/PublicPropertyEditor.cs        |  9 ++++++---
 StaticData/Translations/Master.txt             | 18 ++++++++++++++++++
 Submodules/agg-sharp                           |  2 +-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs b/MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs
index 285a61ea0..bc77749f7 100644
--- a/MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs
+++ b/MatterControlLib/DesignTools/Primitives/ComponentObject3D.cs
@@ -172,7 +172,8 @@ namespace MatterHackers.MatterControl.DesignTools
 			for (int i=0; i<SurfacedEditors.Count; i++)
             {
 				var (cellId, cellData) = this.DecodeContent(i);
-				if (cellData.StartsWith("="))
+				if (cellData != null 
+					&& cellData.StartsWith("="))
 				{
 					var expression = new DoubleOrExpression(cellData);
 					var controledSheet = ControledSheet;
diff --git a/MatterControlLib/DesignTools/PublicPropertyEditor.cs b/MatterControlLib/DesignTools/PublicPropertyEditor.cs
index 34bd4e5c7..08c23134d 100644
--- a/MatterControlLib/DesignTools/PublicPropertyEditor.cs
+++ b/MatterControlLib/DesignTools/PublicPropertyEditor.cs
@@ -1077,9 +1077,12 @@ namespace MatterHackers.MatterControl.DesignTools
 							}
 						}
 
-						propertyObject3D.Invalidated += RefreshField;
-						wrappedTextWidget.Closed += (s, e) => propertyObject3D.Invalidated -= RefreshField;
-					}
+						if (propertyObject3D != null)
+						{
+							propertyObject3D.Invalidated += RefreshField;
+                            wrappedTextWidget.Closed += (s, e) => propertyObject3D.Invalidated -= RefreshField;
+                        }
+                    }
 					else // normal edit row
 					{
 						if (property.PropertyInfo.GetCustomAttributes(true).OfType<MultiLineEditAttribute>().FirstOrDefault() != null)
diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt
index 0c09fb607..a5257b6d2 100644
--- a/StaticData/Translations/Master.txt
+++ b/StaticData/Translations/Master.txt
@@ -925,6 +925,9 @@ Translated:Color 3
 English:Color 4
 Translated:Color 4
 
+English:Color Name
+Translated:Color Name
+
 English:Color View
 Translated:Color View
 
@@ -1411,6 +1414,9 @@ Translated:Distance From Object
 English:Distance or Loops
 Translated:Distance or Loops
 
+English:Do CSG
+Translated:Do CSG
+
 English:Documents
 Translated:Documents
 
@@ -3577,6 +3583,12 @@ Translated:PEI Bed Temperature
 English:Percentage of
 Translated:Percentage of
 
+English:Performe a union before exporting. Might be slower but can clean up some models.
+Translated:Performe a union before exporting. Might be slower but can clean up some models.
+
+English:Performe Union
+Translated:Performe Union
+
 English:Perimeter Acceleration
 Translated:Perimeter Acceleration
 
@@ -4432,6 +4444,12 @@ Translated:Save changes ?
 English:Save Changes?
 Translated:Save Changes?
 
+English:Save Each Separately
+Translated:Save Each Separately
+
+English:Save every object as a separate STL using its name. The save filename will be used if no name can be found.
+Translated:Save every object as a separate STL using its name. The save filename will be used if no name can be found.
+
 English:Save file:
 Translated:Save file:
 
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 0152308cc..370c3bd1c 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 0152308cca0c9768f6cd4c2efddc0a1376026828
+Subproject commit 370c3bd1ce6eb0f7c8e515249425ada033264b83