Fixed an index error in FontTexture (issue #1308)

codeanticode · codeanticode · commit 38638909acf5 · 2012-11-26T23:02:37.000Z
diff --git a/core/src/processing/opengl/FontTexture.java b/core/src/processing/opengl/FontTexture.java
@@ -159,14 +159,14 @@ public boolean addTexture() {
       currentTex = textures.length - 1;
 
       PImage[] tempImg = images;
-      images = new PImage[textures.length + 1];
+      images = new PImage[textures.length];
       PApplet.arrayCopy(tempImg, images, tempImg.length);
       images[tempImg.length] = pg.wrapTexture(tex);
     }
     lastTex = currentTex;
 
     // Make sure that the current texture is bound.
-    //tex.bind();
+    tex.bind();
 
     return resize;
   }
@@ -324,14 +324,6 @@ protected void addToTexture(int idx, PFont.Glyph glyph) {
       }
     }
 
-    if (lastTex == -1) {
-      lastTex = 0;
-    }
-
-    if (currentTex != lastTex || resized) {
-      currentTex = idx;
-    }
-
     TextureInfo tinfo = new TextureInfo(currentTex, offsetX, offsetY,
                                         w, h, rgba);
     offsetX += w;
