From 5e76cb4b01829ba02ee584d0e197f322d7734f45 Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Sat, 31 Mar 2012 18:48:11 +0000
Subject: [PATCH] Fixed popMatrix condition in PShape3D.draw()

---
 android/core/src/processing/opengl/PShape3D.java          | 2 +-
 java/libraries/opengl/src/processing/opengl/PShape3D.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/core/src/processing/opengl/PShape3D.java b/android/core/src/processing/opengl/PShape3D.java
index 694965e60..a7e07f77f 100644
--- a/android/core/src/processing/opengl/PShape3D.java
+++ b/android/core/src/processing/opengl/PShape3D.java
@@ -3761,7 +3761,7 @@ public class PShape3D extends PShape {
         render(texture);
       }
     
-      if (matrix != null) {
+      if (matrix != null && applyMatrix) {
         g.popMatrix();
       } 
     }
diff --git a/java/libraries/opengl/src/processing/opengl/PShape3D.java b/java/libraries/opengl/src/processing/opengl/PShape3D.java
index 00fc873b9..d45f656e7 100644
--- a/java/libraries/opengl/src/processing/opengl/PShape3D.java
+++ b/java/libraries/opengl/src/processing/opengl/PShape3D.java
@@ -3772,7 +3772,7 @@ public class PShape3D extends PShape {
         render(texture);
       }
     
-      if (matrix != null) {
+      if (matrix != null && applyMatrix) {
         g.popMatrix();
       } 
     }