diff options
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rwxr-xr-x | src/classes/com/sun/opengl/util/j2d/TextRenderer.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index 81f6b74f3..1aa7ff656 100644 --- a/make/build.xml +++ b/make/build.xml @@ -51,7 +51,7 @@ <project name="JOGL" basedir="." default="all"> <!-- This is the version of JOGL you are building --> - <property name="base_version" value="1.1.1-rc5"/> + <property name="base_version" value="1.1.1-rc6"/> <!-- Uncomment this property definition to cause a full release build to be done --> <!-- without needing to specify the RI target on the command line --> diff --git a/src/classes/com/sun/opengl/util/j2d/TextRenderer.java b/src/classes/com/sun/opengl/util/j2d/TextRenderer.java index b20a6c2b1..bb497a4dd 100755 --- a/src/classes/com/sun/opengl/util/j2d/TextRenderer.java +++ b/src/classes/com/sun/opengl/util/j2d/TextRenderer.java @@ -854,6 +854,9 @@ public class TextRenderer GL gl = GLU.getCurrentGL(); // Pop client attrib bits used by the pipelined quad renderer gl.glPopClientAttrib(); + // It's unclear whether this changes the buffer bindings, so + // preemptively zero out the GL_ARRAY_BUFFER binding + gl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0); if (ortho) { getBackingStore().endOrthoRendering(); } else { @@ -1014,6 +1017,9 @@ public class TextRenderer GL gl = GLU.getCurrentGL(); // Pop client attrib bits used by the pipelined quad renderer gl.glPopClientAttrib(); + // It's unclear whether this changes the buffer bindings, so + // preemptively zero out the GL_ARRAY_BUFFER binding + gl.glBindBuffer(GL.GL_ARRAY_BUFFER, 0); if (isOrthoMode) { ((TextureRenderer) oldBackingStore).endOrthoRendering(); } else { |