Merge: merged with sgothel

1 files changed, 4 insertions, 4 deletions

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index 6776feeb7..dbfa3ef4d 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -358,7 +358,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
     public void glVertexPointer(GLArrayData array) {
       if(array.getComponentNumber()==0) return;
       if(array.isVBO()) {
-          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+          glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
       } else {
           glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
       }
@@ -366,7 +366,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
     public void glColorPointer(GLArrayData array) {
       if(array.getComponentNumber()==0) return;
       if(array.isVBO()) {
-          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+          glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
       } else {
           glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
       }
@@ -378,7 +378,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
         throw new GLException("Only 3 components per normal allowed");
       }
       if(array.isVBO()) {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getOffset());
+          glNormalPointer(array.getComponentType(), array.getStride(), array.getVBOOffset());
       } else {
           glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
       }
@@ -386,7 +386,7 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
     public void glTexCoordPointer(GLArrayData array) {
       if(array.getComponentNumber()==0) return;
       if(array.isVBO()) {
-          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getOffset());
+          glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
       } else {
           glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
       }