From ae0808875e666cbb6800d2798efcda7650d239df Mon Sep 17 00:00:00 2001
From: John Lewin <lewin76@gmail.com>
Date: Sat, 8 Sep 2018 11:16:45 -0700
Subject: [PATCH] Handle unassigned color case

---
 MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs      | 2 +-
 .../PartPreviewWindow/View3D/ColorSwatchSelector.cs            | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
index fe417c60e..d7c905736 100644
--- a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
+++ b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
@@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				var selectedItem = scene.SelectedItem;
 				if (selectedItem != null)
 				{
-					itemColorButton.Color = scene.SelectedItem.Color;
+					itemColorButton.Color = (scene.SelectedItem.Color == Color.Transparent) ? theme.MinimalHighlight : scene.SelectedItem.Color;
 					itemMaterialButton.Color = MaterialRendering.Color(scene.SelectedItem.MaterialIndex, theme.MinimalHighlight);
 				}
 
diff --git a/MatterControlLib/PartPreviewWindow/View3D/ColorSwatchSelector.cs b/MatterControlLib/PartPreviewWindow/View3D/ColorSwatchSelector.cs
index 16b474dc8..2c40b3c2b 100644
--- a/MatterControlLib/PartPreviewWindow/View3D/ColorSwatchSelector.cs
+++ b/MatterControlLib/PartPreviewWindow/View3D/ColorSwatchSelector.cs
@@ -80,6 +80,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 						resetButton.Click += (s, e) =>
 						{
 							scene.UndoBuffer.AddAndDo(new ChangeColor(scene.SelectedItem, Color.Transparent));
+
+							// The colorChanged action displays the given color - use .MinimalHighlight rather than no color
+							colorChanged(theme.MinimalHighlight);
 						};
 						colorRow.AddChild(resetButton);
 						break;