From 8a203e93f9c0e440c894f5d2fb05112003b6d9db Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Mon, 31 Mar 2014 09:40:53 -0400
Subject: [PATCH] renamed buffer uniform to ppixels, fix #2325

---
 core/src/processing/opengl/PShader.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/processing/opengl/PShader.java b/core/src/processing/opengl/PShader.java
index 97dbbc891..0f2c92490 100644
--- a/core/src/processing/opengl/PShader.java
+++ b/core/src/processing/opengl/PShader.java
@@ -116,7 +116,7 @@ public class PShader implements PConstants {
   protected int transformMatLoc;
   protected int modelviewMatLoc;
   protected int projectionMatLoc;
-  protected int bufferLoc;
+  protected int ppixelsLoc;
   protected int bufferUnit;
   protected int viewportLoc;
 
@@ -1158,7 +1158,7 @@ public class PShader implements PConstants {
       projectionMatLoc = getUniformLoc("projectionMatrix");
 
     viewportLoc = getUniformLoc("viewport");
-    bufferLoc = getUniformLoc("buffer");
+    ppixelsLoc = getUniformLoc("ppixels");
 
     normalMatLoc = getUniformLoc("normalMatrix");
 
@@ -1209,9 +1209,9 @@ public class PShader implements PConstants {
       setUniformValue(viewportLoc, x, y, w, h);
     }
 
-    if (-1 < bufferLoc) {
+    if (-1 < ppixelsLoc) {
       bufferUnit = getLastTexUnit() + 1;
-      setUniformValue(bufferLoc, bufferUnit);
+      setUniformValue(ppixelsLoc, bufferUnit);
       pgl.activeTexture(PGL.TEXTURE0 + bufferUnit);
       currentPG.bindFrontTexture();
     } else {
@@ -1304,7 +1304,7 @@ public class PShader implements PConstants {
     if (-1 < texCoordLoc) pgl.disableVertexAttribArray(texCoordLoc);
     if (-1 < normalLoc) pgl.disableVertexAttribArray(normalLoc);
 
-    if (-1 < bufferLoc) {
+    if (-1 < ppixelsLoc) {
       pgl.requestFBOLayer();
       pgl.activeTexture(PGL.TEXTURE0 + bufferUnit);
       currentPG.unbindFrontTexture();