diff options
| author | Kenneth Russel <[email protected]> | 2007-10-13 01:49:11 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2007-10-13 01:49:11 +0000 |
| commit | 78c8f6dad2e35d79594be3eae6b3bab187f0b4ec (patch) | |
| tree | b7bc733e617df3a1577b29af4bd3124826e89cdb | |
| parent | 30e187799ca19c74bce6763bbf03ec520829dd47 (diff) | |
Undid last checkin as it appears the current glPushClientAttrib /
glPopClientAttrib in the TextRenderer are sufficient. Reverted back to
nightly build numbering scheme; 1.1.1-rc6 version number not yet used.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1398 232f8b59-042b-4e1e-8c03-345bb8c30851
| -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 { |