From 141482fc530ca042073b09aff9ce280978f8a7b5 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 10 Feb 2020 12:01:53 +0100
Subject: [PATCH] char: remove deprecated overload of
 Character::merge_bundles()

---
 panda/src/char/character.cxx | 30 ------------------------------
 panda/src/char/character.h   |  1 -
 2 files changed, 31 deletions(-)

diff --git a/panda/src/char/character.cxx b/panda/src/char/character.cxx
index eb894fe99c..f055378992 100644
--- a/panda/src/char/character.cxx
+++ b/panda/src/char/character.cxx
@@ -237,36 +237,6 @@ calc_tight_bounds(LPoint3 &min_point, LPoint3 &max_point, bool &found_any,
                                       found_any, transform, current_thread);
 }
 
-/**
- * Merges old_bundle with new_bundle.  old_bundle must be one of the
- * PartBundles within this node.  At the end of this call, the old_bundle
- * pointer within this node will be replaced with the new_bundle pointer, and
- * all geometry within this node will be updated to reference new_bundle.
- *
- * @deprecated Use the newer version of this method, below.
- */
-void Character::
-merge_bundles(PartBundle *old_bundle, PartBundle *new_bundle) {
-  if (old_bundle == new_bundle) {
-    // Trivially return.
-    return;
-  }
-
-  // Find the PartBundleHandle of old_bundle.
-  PT(PartBundleHandle) old_bundle_handle;
-  Bundles::const_iterator bi;
-  for (bi = _bundles.begin(); bi != _bundles.end(); ++bi) {
-    if ((*bi)->get_bundle() == old_bundle) {
-      old_bundle_handle = (*bi);
-      break;
-    }
-  }
-  nassertv(!old_bundle_handle.is_null());
-
-  PT(PartBundleHandle) new_bundle_handle = new PartBundleHandle(new_bundle);
-  merge_bundles(old_bundle_handle, new_bundle_handle);
-}
-
 /**
  * Merges old_bundle_handle->get_bundle() with new_bundle.  old_bundle_handle
  * must be one of the PartBundleHandle within this node.  At the end of this
diff --git a/panda/src/char/character.h b/panda/src/char/character.h
index a7c6c79f13..83aa754ee8 100644
--- a/panda/src/char/character.h
+++ b/panda/src/char/character.h
@@ -59,7 +59,6 @@ PUBLISHED:
   virtual PandaNode *combine_with(PandaNode *other);
 
   INLINE CharacterJointBundle *get_bundle(int i) const;
-  void merge_bundles(PartBundle *old_bundle, PartBundle *other_bundle);
   void merge_bundles(PartBundleHandle *old_bundle_handle,
                      PartBundleHandle *other_bundle_handle);