From 5cde2cac88093d0aca2e363845e99debcd6d0f09 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Tue, 5 May 2009 20:13:21 +0000 Subject: [PATCH] Reset texture matrix in GL1TextOutputProvider .Begin() and restore in GL1TextOutputProvider .End(). Fixes bug [#810] "Bad texture matrix in TextPrinter" (http://www.opentk.com/node/810)). --- Source/Utilities/Graphics/Text/GL1TextOutputProvider.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Utilities/Graphics/Text/GL1TextOutputProvider.cs b/Source/Utilities/Graphics/Text/GL1TextOutputProvider.cs index e4b783b3..8da65531 100644 --- a/Source/Utilities/Graphics/Text/GL1TextOutputProvider.cs +++ b/Source/Utilities/Graphics/Text/GL1TextOutputProvider.cs @@ -198,6 +198,10 @@ namespace OpenTK.Graphics.Text GL.PushMatrix(); GL.LoadIdentity(); + GL.MatrixMode(MatrixMode.Texture); + GL.PushMatrix(); + GL.LoadIdentity(); + GL.MatrixMode((MatrixMode)current_matrix); } @@ -215,6 +219,9 @@ namespace OpenTK.Graphics.Text int current_matrix; GL.GetInteger(GetPName.MatrixMode, out current_matrix); + GL.MatrixMode(MatrixMode.Texture); + GL.PopMatrix(); + GL.MatrixMode(MatrixMode.Modelview); GL.PopMatrix();