diff --git a/ActionBar/TemperatureWidgetExtruder.cs b/ActionBar/TemperatureWidgetExtruder.cs index 08c183ea7..19556ce7a 100644 --- a/ActionBar/TemperatureWidgetExtruder.cs +++ b/ActionBar/TemperatureWidgetExtruder.cs @@ -108,7 +108,7 @@ namespace MatterHackers.MatterControl.ActionBar }; container.AddChild(new SettingsItem( - string.Format("{0} {1}", "HotEnd".Localize(), extruderIndex + 1), + string.Format("{0} {1}", "Hot End".Localize(), extruderIndex + 1), new SettingsItem.ToggleSwitchConfig() { Checked = false, diff --git a/PartPreviewWindow/View3D/MeshViewerWidget.cs b/PartPreviewWindow/View3D/MeshViewerWidget.cs index 12dbc358f..65f445b06 100644 --- a/PartPreviewWindow/View3D/MeshViewerWidget.cs +++ b/PartPreviewWindow/View3D/MeshViewerWidget.cs @@ -361,7 +361,7 @@ namespace MatterHackers.MeshVisualizer private void DrawObject(IObject3D object3D, Matrix4X4 transform, List transparentMeshes, bool parentSelected, DrawEventArgs e) { - foreach (var renderData in object3D.VisibleMeshes(transform)) + foreach (var renderData in object3D.VisibleMeshes(transform, object3D.Color, object3D.MaterialIndex, object3D.OutputType)) { bool isSelected = parentSelected || scene.HasSelection && (object3D == scene.SelectedItem || scene.SelectedItem.Children.Contains(object3D)); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index d0df58797..d3b689891 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit d0df587978c306fc9220854fe978cddac0fba0e5 +Subproject commit d3b689891485d6687c9aa1692996fa8b62a53050