Merge: merged with sgothel

1 files changed, 4 insertions, 4 deletions

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index faff8b89f..0a0f87897 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -295,7 +295,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());
   }
@@ -303,7 +303,7 @@ public void glVertexPointer(GLArrayData array) {
 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());
   }
@@ -315,7 +315,7 @@ public void glNormalPointer(GLArrayData array) {
     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());
   }
@@ -323,7 +323,7 @@ public void glNormalPointer(GLArrayData array) {
 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());
   }