From 592b4a06534202275111ec9a6a820cd9ce7ab44b Mon Sep 17 00:00:00 2001 From: codeanticode Date: Wed, 8 Aug 2012 23:23:53 +0000 Subject: [PATCH] small fix when setting sampling uniform --- android/core/src/processing/opengl/PShader.java | 6 +++--- core/src/processing/opengl/PShader.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/core/src/processing/opengl/PShader.java b/android/core/src/processing/opengl/PShader.java index dcb66b532..7bb85c5e2 100644 --- a/android/core/src/processing/opengl/PShader.java +++ b/android/core/src/processing/opengl/PShader.java @@ -580,10 +580,10 @@ public class PShader { PImage img = (PImage)val.value; Texture tex = pgMain.getTexture(img); pgl.glUniform1i(loc, texUnit); - if (textures == null) { + if (textures == null) { textures = new HashMap(); - textures.put(texUnit, tex); - } + } + textures.put(texUnit, tex); texUnit++; } } diff --git a/core/src/processing/opengl/PShader.java b/core/src/processing/opengl/PShader.java index dcb66b532..7bb85c5e2 100644 --- a/core/src/processing/opengl/PShader.java +++ b/core/src/processing/opengl/PShader.java @@ -580,10 +580,10 @@ public class PShader { PImage img = (PImage)val.value; Texture tex = pgMain.getTexture(img); pgl.glUniform1i(loc, texUnit); - if (textures == null) { + if (textures == null) { textures = new HashMap(); - textures.put(texUnit, tex); - } + } + textures.put(texUnit, tex); texUnit++; } }