From b3e1894109ebae19387629e5e73d65210bb7a047 Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Sat, 31 Mar 2012 18:41:32 +0000
Subject: [PATCH] Can use TRIANGLE and QUAD in createShape(type)

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

diff --git a/android/core/src/processing/opengl/PGraphicsOpenGL.java b/android/core/src/processing/opengl/PGraphicsOpenGL.java
index 44c5eed02..62be76126 100644
--- a/android/core/src/processing/opengl/PGraphicsOpenGL.java
+++ b/android/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -1897,7 +1897,7 @@ public class PGraphicsOpenGL extends PGraphics {
     } else if (type == LINES) {
       shape = new PShape3D(parent, PShape.GEOMETRY);
       shape.setKind(LINES);
-    } else if (type == TRIANGLES) {
+    } else if (type == TRIANGLE || type == TRIANGLES) {
       shape = new PShape3D(parent, PShape.GEOMETRY);
       shape.setKind(TRIANGLES);
     } else if (type == TRIANGLE_FAN) {
@@ -1906,7 +1906,7 @@ public class PGraphicsOpenGL extends PGraphics {
     } else if (type == TRIANGLE_STRIP) {      
       shape = new PShape3D(parent, PShape.GEOMETRY);
       shape.setKind(TRIANGLE_STRIP);
-    } else if (type == QUADS) {
+    } else if (type == QUADS || type == QUADS) {
       shape = new PShape3D(parent, PShape.GEOMETRY);
       shape.setKind(QUADS);
     } else if (type == QUAD_STRIP) {
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
index 4829f4785..fd06eec9a 100644
--- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -1908,7 +1908,7 @@ public class PGraphicsOpenGL extends PGraphics {
     } else if (type == LINES) {
       shape = new PShape3D(parent, PShape.GEOMETRY);
       shape.setKind(LINES);
-    } else if (type == TRIANGLES) {
+    } else if (type == TRIANGLE || type == TRIANGLES) {
       shape = new PShape3D(parent, PShape.GEOMETRY);
       shape.setKind(TRIANGLES);
     } else if (type == TRIANGLE_FAN) {
@@ -1917,7 +1917,7 @@ public class PGraphicsOpenGL extends PGraphics {
     } else if (type == TRIANGLE_STRIP) {      
       shape = new PShape3D(parent, PShape.GEOMETRY);
       shape.setKind(TRIANGLE_STRIP);
-    } else if (type == QUADS) {
+    } else if (type == QUADS || type == QUADS) {
       shape = new PShape3D(parent, PShape.GEOMETRY);
       shape.setKind(QUADS);
     } else if (type == QUAD_STRIP) {