Cleanup GLArrayData*, misc stuff

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1762 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 4 insertions, 3 deletions

diff --git a/src/classes/javax/media/opengl/util/ImmModeSink.java b/src/classes/javax/media/opengl/util/ImmModeSink.java
index 04173cb6f..4ef8cacf7 100644
--- a/src/classes/javax/media/opengl/util/ImmModeSink.java
+++ b/src/classes/javax/media/opengl/util/ImmModeSink.java
@@ -399,10 +399,10 @@ public class ImmModeSink {
             Exception e = new Exception("ImmModeSink.draw["+i+"](disableBufferAfterDraw: "+disableBufferAfterDraw+"):\n\t"+this);
             e.printStackTrace();
         }
-        vertexVBO.enableBuffer(gl, true);
         normalVBO.enableBuffer(gl, true);
         colorVBO.enableBuffer(gl, true);
         texcoordVBO.enableBuffer(gl, true);
+        vertexVBO.enableBuffer(gl, true);
 
         if (vertexVBO.getBuffer()!=null) {
             if(null==indices) {
@@ -419,14 +419,15 @@ public class ImmModeSink {
                     throw new GLException("Given Buffer Class not supported: "+clazz+", should be ubyte or ushort:\n\t"+this);
                 }
                 gl.glDrawElements(mode, indices.remaining(), type, indices);
+                // GL2: gl.glDrawRangeElements(mode, 0, indices.remaining()-1, indices.remaining(), type, indices);
             }
         }
 
         if(disableBufferAfterDraw) {
             vertexVBO.enableBuffer(gl, false);
-            normalVBO.enableBuffer(gl, false);
-            colorVBO.enableBuffer(gl, false);
             texcoordVBO.enableBuffer(gl, false);
+            colorVBO.enableBuffer(gl, false);
+            normalVBO.enableBuffer(gl, false);
         }
     }