@@ -6,12 +6,12 @@ and incorporating various pull requests.
 
 [ changes ]
 
-+ Removed the sound library, it's now available as its own library 
++ Removed the sound library. It's now available as its own library 
   from the Library Manager.
 
 + Change how languages are loaded, adding a local override.
 
-+ Update to use JRE/JDK 7u72 .
++ Update to use JRE/JDK 7u72
 
 + Implement the active() method for Serial and Server 
   https://github.com/processing/processing/issues/2364
@@ -34,6 +34,10 @@ and incorporating various pull requests.
 
 + Support "header" option with ODS files
 
++ Show a warning when calling getVertexCount() on GROUP or PRIMITIVE shapes
+  https://github.com/processing/processing/issues/2873
+  https://github.com/processing/processing-docs/issues/167
+
 
 [ bug fixes ]
 
@@ -152,6 +156,10 @@ and incorporating various pull requests.
   https://github.com/processing/processing/issues/2576
   https://github.com/processing/processing/pull/2922
 
++ 'return' keyword not treated as such when followed by a bracket
+  https://github.com/processing/processing/issues/2099
+  https://github.com/processing/processing/pull/2958
+
 
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
 
 
@@ -513,7 +513,7 @@ static protected PShape createShapeImpl(PGraphicsJava2D pg, int type) {
     } else if (type == PShape.GEOMETRY) {
       shape = new PShape(pg, PShape.GEOMETRY);
     }
-    shape.is3D(false);
+    shape.set3D(false);
     return shape;
   }
 
@@ -584,7 +584,7 @@ static protected PShape createShapeImpl(PGraphicsJava2D pg,
       shape.setParams(p);
     }
 
-    shape.is3D(false);
+    shape.set3D(false);
     return shape;
   }
 
 
@@ -112,6 +112,9 @@ public class PShape implements PConstants {
   public static final String NO_SUCH_VERTEX_ERROR =
     "%1$s vertex index does not exist";
 
+  static public final String NO_VERTICES_ERROR =
+    "getVertexCount() only works with PATH or GEOMETRY shapes";
+
   // boundary box of this shape
   //protected float x;
   //protected float y;
@@ -539,7 +542,7 @@ public boolean is3D() {
   }
 
 
-  public void is3D(boolean val) {
+  public void set3D(boolean val) {
     is3D = val;
   }
 
@@ -2051,6 +2054,9 @@ protected void setPath(int vcount, float[][] verts, int ccount, int[] codes) {
    * @see PShape#setVertex(int, float, float)
    */
   public int getVertexCount() {
+    if (family == GROUP || family == PRIMITIVE) {
+      PGraphics.showWarning(NO_VERTICES_ERROR);
+    }
     return vertexCount;
   }
 
@@ -2100,6 +2106,7 @@ public float getVertexZ(int index) {
     return vertices[index][Z];
   }
 
+
   /**
    * @webref pshape:method
    * @brief Sets the vertex at the index position
@@ -2119,6 +2126,7 @@ public void setVertex(int index, float x, float y) {
     vertices[index][Y] = y;
   }
 
+
   /**
    * @param z the z value for the vertex
    */
@@ -2133,6 +2141,7 @@ public void setVertex(int index, float x, float y, float z) {
     vertices[index][Z] = z;
   }
 
+
   /**
    * @param vec the PVector to define the x, y, z coordinates
    */
 
@@ -308,7 +308,7 @@ static protected PShapeOpenGL createShapeImpl(PGraphicsOpenGL pg, int type) {
     } else if (type == PShape.GEOMETRY) {
       shape = new PShapeOpenGL(pg, PShape.GEOMETRY);
     }
-    shape.is3D(false);
+    shape.set3D(false);
     return shape;
   }
 
@@ -379,7 +379,7 @@ static protected PShapeOpenGL createShapeImpl(PGraphicsOpenGL pg,
       shape.setParams(p);
     }
 
-    shape.is3D(false);
+    shape.set3D(false);
     return shape;
   }
 
 
@@ -191,7 +191,7 @@ static protected PShapeOpenGL createShapeImpl(PGraphicsOpenGL pg, int type) {
     } else if (type == PShape.GEOMETRY) {
       shape = new PShapeOpenGL(pg, PShape.GEOMETRY);
     }
-    shape.is3D(true);
+    shape.set3D(true);
     return shape;
   }
 
@@ -272,7 +272,7 @@ static protected PShapeOpenGL createShapeImpl(PGraphicsOpenGL pg,
       shape.setParams(p);
     }
 
-    shape.is3D(true);
+    shape.set3D(true);
     return shape;
   }
 }
@@ -1,6 +1,10 @@
 0232 core (3.0a5) 
 X detect CMYK JPEG images and return null
 X   https://community.oracle.com/thread/1272045?start=0&tstart=0
+X show a warning when calling getVertexCount() on GROUP or PRIMITIVE shapes
+X   https://github.com/processing/processing/issues/2873
+X   https://github.com/processing/processing-docs/issues/167
+X replace is3D(boolean) with set3D() 
 
 data
 X fix XML.getString() with a default when no attrs are present at all
Original file line number	Diff line number	Diff line change
@@ -513,7 +513,7 @@ static protected PShape createShapeImpl(PGraphicsJava2D pg, int type) {
513	513	} else if (type == PShape.GEOMETRY) {
514	514	shape = new PShape(pg, PShape.GEOMETRY);
515	515	}
516		- shape.is3D(false);
	516	+ shape.set3D(false);
517	517	return shape;
518	518	}
519	519
@@ -584,7 +584,7 @@ static protected PShape createShapeImpl(PGraphicsJava2D pg,
584	584	shape.setParams(p);
585	585	}
586	586
587		- shape.is3D(false);
	587	+ shape.set3D(false);
588	588	return shape;
589	589	}
590	590
Original file line number	Diff line number	Diff line change
@@ -308,7 +308,7 @@ static protected PShapeOpenGL createShapeImpl(PGraphicsOpenGL pg, int type) {
308	308	} else if (type == PShape.GEOMETRY) {
309	309	shape = new PShapeOpenGL(pg, PShape.GEOMETRY);
310	310	}
311		- shape.is3D(false);
	311	+ shape.set3D(false);
312	312	return shape;
313	313	}
314	314
@@ -379,7 +379,7 @@ static protected PShapeOpenGL createShapeImpl(PGraphicsOpenGL pg,
379	379	shape.setParams(p);
380	380	}
381	381
382		- shape.is3D(false);
	382	+ shape.set3D(false);
383	383	return shape;
384	384	}
385	385
Original file line number	Diff line number	Diff line change
@@ -191,7 +191,7 @@ static protected PShapeOpenGL createShapeImpl(PGraphicsOpenGL pg, int type) {
191	191	} else if (type == PShape.GEOMETRY) {
192	192	shape = new PShapeOpenGL(pg, PShape.GEOMETRY);
193	193	}
194		- shape.is3D(true);
	194	+ shape.set3D(true);
195	195	return shape;
196	196	}
197	197
@@ -272,7 +272,7 @@ static protected PShapeOpenGL createShapeImpl(PGraphicsOpenGL pg,
272	272	shape.setParams(p);
273	273	}
274	274
275		- shape.is3D(true);
	275	+ shape.set3D(true);
276	276	return shape;
277	277	}
278	278	}