From fb4db4bf2fc12c49bec774846f3908f6ccef7dd5 Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Mon, 7 Feb 2011 06:46:53 +0000
Subject: [PATCH] Renamed mergeRecord to mergeShapes and removed noMergeRecord

---
 core/src/processing/core/PApplet.java   | 12 +++---------
 core/src/processing/core/PGraphics.java | 11 +++++------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index ff6b8ab92..f92c83dc1 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -10236,15 +10236,9 @@ public class PApplet extends Applet
   }
 
 
-  public void mergeRecord() { 
-    if (recorder != null) recorder.mergeRecord();
-    g.mergeRecord();
-  }
-
-
-  public void noMergeRecord() { 
-    if (recorder != null) recorder.noMergeRecord();
-    g.noMergeRecord();
+  public void mergeShapes(boolean val) { 
+    if (recorder != null) recorder.mergeShapes(val);
+    g.mergeShapes(val);
   }
 
 
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
index b88376ef9..b02ccd8da 100644
--- a/core/src/processing/core/PGraphics.java
+++ b/core/src/processing/core/PGraphics.java
@@ -5983,26 +5983,25 @@ public class PGraphics extends PImage implements PConstants {
     showMissingWarning("noBlend");
   }
   
+  
   public PShape beginRecord() { // ignore
     showMissingWarning("beginRecord");
     return null;
   }
   
+  
   public void endRecord() {  // ignore
     showMissingWarning("endShapeRecord");    
   }
   
+  
   public boolean isRecording() { // ignore
     return false;
   }
   
-  public void mergeRecord() { 
-    showMissingWarning("mergeRecord");    
-  }
-
   
-  public void noMergeRecord() { 
-    showMissingWarning("noMergeRecord");
+  public void mergeShapes(boolean val) { 
+    showMissingWarning("mergeShapes");    
   }