diff options
| -rw-r--r-- | make/build.xml | 4 | ||||
| -rwxr-xr-x | src/classes/com/sun/opengl/util/j2d/TextRenderer.java | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/make/build.xml b/make/build.xml index 1aa7ff656..5e8e3085d 100644 --- a/make/build.xml +++ b/make/build.xml @@ -51,11 +51,11 @@ <project name="JOGL" basedir="." default="all"> <!-- This is the version of JOGL you are building --> - <property name="base_version" value="1.1.1-rc6"/> + <property name="base_version" value="1.1.1"/> <!-- Uncomment this property definition to cause a full release build to be done --> <!-- without needing to specify the RI target on the command line --> - <property name="RImanifestfile" value="joglRIversion" /> + <!-- property name="RImanifestfile" value="joglRIversion" / --> <!-- Pull in GlueGen cpptasks build file --> <property name="gluegen.root" value="../../gluegen" /> diff --git a/src/classes/com/sun/opengl/util/j2d/TextRenderer.java b/src/classes/com/sun/opengl/util/j2d/TextRenderer.java index bb497a4dd..b20a6c2b1 100755 --- a/src/classes/com/sun/opengl/util/j2d/TextRenderer.java +++ b/src/classes/com/sun/opengl/util/j2d/TextRenderer.java @@ -854,9 +854,6 @@ 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 { @@ -1017,9 +1014,6 @@ 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 { |