From e692492c3198d3deb13e8313ac4638bae2417412 Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Fri, 25 Aug 2017 15:24:28 -0700
Subject: [PATCH] Make sure we can switch back to solid

---
 PartPreviewWindow/View3D/GeneralObject3DEditor.cs |  9 ++-------
 PartPreviewWindow/View3D/MeshViewerWidget.cs      | 12 ++++++------
 PartPreviewWindow/ViewGcodeBasic.cs               |  2 --
 Submodules/agg-sharp                              |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/PartPreviewWindow/View3D/GeneralObject3DEditor.cs b/PartPreviewWindow/View3D/GeneralObject3DEditor.cs
index d9891548f..bf943f009 100644
--- a/PartPreviewWindow/View3D/GeneralObject3DEditor.cs
+++ b/PartPreviewWindow/View3D/GeneralObject3DEditor.cs
@@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			var buttonMargin = new BorderDouble(2, 5);
 
 			// put in the button for making the behavior solid
-			Button solidButtonView = theme.ButtonFactory.Generate("Solid".Localize());
+			var solidButtonView = theme.ButtonFactory.Generate("Solid".Localize());
 			var solidBehaviorButton = new PopupButton(solidButtonView)
 			{
 				Name = "Solid Colors",
@@ -79,7 +79,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				},
 				Margin = buttonMargin
 			};
-			solidButtonView.Click += (s, e) =>
+			solidBehaviorButton.Click += (s, e) =>
 			{
 				item.OutputType = PrintOutputTypes.Solid;
 			};
@@ -92,11 +92,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			holeBehaviorButton.Click += (s, e) =>
 			{
 				item.OutputType = PrintOutputTypes.Hole;
-				if(item.Mesh != null)
-				{
-					item.Mesh.FaceBspTree = FaceBspTree.Create(item.Mesh);
-				}
-
 				view3DWidget.Invalidate();
 			};
 
diff --git a/PartPreviewWindow/View3D/MeshViewerWidget.cs b/PartPreviewWindow/View3D/MeshViewerWidget.cs
index cd4df2396..12dbc358f 100644
--- a/PartPreviewWindow/View3D/MeshViewerWidget.cs
+++ b/PartPreviewWindow/View3D/MeshViewerWidget.cs
@@ -384,7 +384,7 @@ namespace MatterHackers.MeshVisualizer
 
 				if (drawColor.alpha == 255)
 				{
-					GLHelper.Render(renderData.Mesh, drawColor, renderData.Matrix, RenderType);
+					GLHelper.Render(renderData.Mesh, drawColor, renderData.Matrix, RenderType, renderData.Matrix * World.ModelviewMatrix);
 				}
 				else
 				{
@@ -530,7 +530,7 @@ namespace MatterHackers.MeshVisualizer
 				{
 					var color = transparentRenderData.Color;
 					//color = RGBA_Floats.FromHSL(Math.Max(colorIndex++, 0) / 10.0, .99, .49).GetAsRGBA_Bytes();
-					GLHelper.Render(transparentRenderData.Mesh, color, transparentRenderData.Matrix, RenderType);
+					GLHelper.Render(transparentRenderData.Mesh, color, transparentRenderData.Matrix, RenderTypes.Outlines, transparentRenderData.Matrix * World.ModelviewMatrix);
 				}
 			}
 			else
@@ -538,7 +538,7 @@ namespace MatterHackers.MeshVisualizer
 				// render the transparent stuff
 				foreach (var transparentRenderData in transparentMeshes)
 				{
-					GLHelper.Render(transparentRenderData.Mesh, transparentRenderData.Color, transparentRenderData.Matrix, RenderType);
+					GLHelper.Render(transparentRenderData.Mesh, transparentRenderData.Color, transparentRenderData.Matrix, RenderTypes.Outlines, transparentRenderData.Matrix * World.ModelviewMatrix);
 				}
 				// than render the bed 
 				RenderBedMesh(lookingDownOnBed);
@@ -575,16 +575,16 @@ namespace MatterHackers.MeshVisualizer
 					{
 						bedColor = new RGBA_Bytes(this.BedColor, this.BedColor.alpha / 4);
 					}
-					GLHelper.Render(printer.Bed.Mesh, bedColor);
+					GLHelper.Render(printer.Bed.Mesh, bedColor, RenderTypes.Shaded, World.ModelviewMatrix);
 					if (printerShape != null)
 					{
-						GLHelper.Render(printerShape, bedColor);
+						GLHelper.Render(printerShape, bedColor, RenderTypes.Shaded, World.ModelviewMatrix);
 					}
 				}
 
 				if (printer.Bed.BuildVolumeMesh != null && RenderBuildVolume)
 				{
-					GLHelper.Render(printer.Bed.BuildVolumeMesh, this.BuildVolumeColor);
+					GLHelper.Render(printer.Bed.BuildVolumeMesh, this.BuildVolumeColor, RenderTypes.Shaded, World.ModelviewMatrix);
 				}
 			}
 			else
diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index 9253366a4..b7d5f36a1 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -61,8 +61,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			this.printer = printer;
 			this.viewControls3D = viewControls3D;
 
-			RenderOpenGl.GLHelper.WireframeColor = ActiveTheme.Instance.PrimaryAccentColor;
-
 			CreateAndAddChildren();
 
 			ActiveSliceSettings.SettingChanged.RegisterEvent((s, e) =>
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 409e98615..a298fe498 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 409e98615fd3a51519b27ce1405e27c7942383f9
+Subproject commit a298fe4984a29c476d2477e24b440b3b23b410bd