From 7ac9043abbc5bc3d5c41bf2afdac8510812ac8a6 Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Sat, 26 May 2012 23:32:12 +0000
Subject: [PATCH] update active variable in PShader, unbind VBOs in
 drawTexture, drawRect

---
 java/libraries/opengl/src/processing/opengl/PGL.java     | 4 ++++
 java/libraries/opengl/src/processing/opengl/PShader.java | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/java/libraries/opengl/src/processing/opengl/PGL.java b/java/libraries/opengl/src/processing/opengl/PGL.java
index ad0bf7dfb..a4d39807b 100644
--- a/java/libraries/opengl/src/processing/opengl/PGL.java
+++ b/java/libraries/opengl/src/processing/opengl/PGL.java
@@ -1376,6 +1376,8 @@ public class PGL {
       enableTexturing(target);
       glActiveTexture(GL_TEXTURE0);
       glBindTexture(target, id);
+                
+      glBindBuffer(GL_ARRAY_BUFFER, 0); // Making sure that no VBO is bound at this point.
       
       texData.position(0);
       glVertexAttribPointer(texVertLoc, 2, GL_FLOAT, false, 4 * SIZEOF_FLOAT, texData);
@@ -1451,6 +1453,8 @@ public class PGL {
       rectData.rewind();
       rectData.put(rectCoords);
 
+      glBindBuffer(GL_ARRAY_BUFFER, 0); // Making sure that no VBO is bound at this point.
+      
       rectData.position(0);
       glVertexAttribPointer(rectVertLoc, 2, GL_FLOAT, false, 2 * SIZEOF_FLOAT, rectData);
 
diff --git a/java/libraries/opengl/src/processing/opengl/PShader.java b/java/libraries/opengl/src/processing/opengl/PShader.java
index 172a92cc9..42c951eba 100644
--- a/java/libraries/opengl/src/processing/opengl/PShader.java
+++ b/java/libraries/opengl/src/processing/opengl/PShader.java
@@ -155,6 +155,7 @@ public class PShader {
   public void start() {    
     init();  
     pgl.glUseProgram(programObject);
+    active = true;
   }
 
   
@@ -163,6 +164,7 @@ public class PShader {
    */
   public void stop() {
     pgl.glUseProgram(0);
+    active = false;
   }