From 7a08405d559b79dde68442b952827fbfaef5f886 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sun, 22 Nov 2020 07:50:06 -0800 Subject: [PATCH] finishing up gl refactor fixing typo issue: MatterHackers/MCCentral#6185 Typo in Re-slice diologue box --- MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs | 4 ++-- MatterControlLib/PartPreviewWindow/PrinterTabPage.cs | 2 +- Submodules/agg-sharp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs b/MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs index 35e6d62f3..8fd781279 100644 --- a/MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs +++ b/MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs @@ -200,8 +200,8 @@ namespace MatterHackers.GCodeVisualizer { UiThread.RunOnIdle(() => { - GL.DeleteBuffers(1, ref vertexID); - GL.DeleteBuffers(1, ref indexID); + GL.DeleteBuffer(vertexID); + GL.DeleteBuffer(indexID); }); disposed = true; diff --git a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs index d6d6b42d0..7aff1f8e8 100644 --- a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs +++ b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs @@ -818,7 +818,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // setup the message row { // when it is done queue it to the change to gcode stream - var switchMessage = "Switch to new G-Code?\n\nBefore you switch, check that your are seeing the changes you expect.".Localize(); + var switchMessage = "Switch to new G-Code?\n\nBefore you switch, check that you are seeing the changes you expect.".Localize(); resliceMessageRow.AddChild(new WrappedTextWidget(switchMessage, theme.DefaultFontSize, textColor: theme.TextColor) { Margin = new BorderDouble(7, 3) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 3298dfc8d..234cca570 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 3298dfc8dda49d127473203f63144d900b5edd13 +Subproject commit 234cca570dfc282a9ed892efa5ac34c5739dd966