From 7ddb6545e31c5dbc18bd8fe7baee1992f35ea128 Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Mon, 13 Dec 2010 09:41:55 +0000
Subject: [PATCH] Clearing resource sets in deleteAllGLResources() method

---
 android/core/src/processing/core/PFont.java              | 3 ---
 android/core/src/processing/core/PGraphicsAndroid3D.java | 9 ++++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/core/src/processing/core/PFont.java b/android/core/src/processing/core/PFont.java
index ef00c9f29..6d8bda35b 100644
--- a/android/core/src/processing/core/PFont.java
+++ b/android/core/src/processing/core/PFont.java
@@ -27,15 +27,12 @@ import java.io.*;
 import java.util.Arrays;
 import java.util.HashMap;
 
-import javax.microedition.khronos.opengles.GL10;
-
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.graphics.Bitmap.Config;
-import android.opengl.GLU;
 
 /**
  * Grayscale bitmap font class used by Processing.
diff --git a/android/core/src/processing/core/PGraphicsAndroid3D.java b/android/core/src/processing/core/PGraphicsAndroid3D.java
index af8cb330a..18e1ea316 100644
--- a/android/core/src/processing/core/PGraphicsAndroid3D.java
+++ b/android/core/src/processing/core/PGraphicsAndroid3D.java
@@ -24,7 +24,6 @@ package processing.core;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.util.ArrayList;
 import java.util.EmptyStackException;
@@ -608,6 +607,7 @@ public class PGraphicsAndroid3D extends PGraphics {
         int[] temp = { id };
         gl.glDeleteTextures(1, temp, 0);
       }
+      glTextureObjects.clear();
     }
     
     if (!glVertexBuffers.isEmpty()) {
@@ -616,7 +616,8 @@ public class PGraphicsAndroid3D extends PGraphics {
         int id = ((Integer)glids[i]).intValue();
         int[] temp = { id };
         gl11.glDeleteBuffers(1, temp, 0);
-      }      
+      }
+      glVertexBuffers.clear();
     }
     
     if (!glFrameBuffers.isEmpty()) {
@@ -625,7 +626,8 @@ public class PGraphicsAndroid3D extends PGraphics {
         int id = ((Integer)glids[i]).intValue();
         int[] temp = { id };
         gl11xp.glDeleteFramebuffersOES(1, temp, 0);
-      }      
+      }
+      glFrameBuffers.clear();
     }
     
     if (!glRenderBuffers.isEmpty()) {
@@ -635,6 +637,7 @@ public class PGraphicsAndroid3D extends PGraphics {
         int[] temp = { id };
         gl11xp.glDeleteRenderbuffersOES(1, temp, 0);
       }
+      glRenderBuffers.clear();
     }
   }