1 files changed, 6 insertions, 0 deletions
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 {