From 430a4b21e0df49c8ebda9eb5a87f9f21c49adcff Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sun, 12 Feb 2006 20:16:26 +0000
Subject: [PATCH] fix pview -i

---
 panda/src/chan/auto_bind.cxx | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/panda/src/chan/auto_bind.cxx b/panda/src/chan/auto_bind.cxx
index 0f4e542322..e53ad2967f 100644
--- a/panda/src/chan/auto_bind.cxx
+++ b/panda/src/chan/auto_bind.cxx
@@ -42,15 +42,17 @@ static void
 bind_anims(const PartNodes &parts, const AnimNodes &anims,
            AnimControlCollection &controls,
            int hierarchy_match_flags) {
-
+  cerr << "bind_anims\n";
   PartNodes::const_iterator pni;
 
   for (pni = parts.begin(); pni != parts.end(); ++pni) {
     PartBundle *part = (*pni)->get_bundle();
+    cerr << "got part " << *part << "\n";
 
     AnimNodes::const_iterator ani;
     for (ani = anims.begin(); ani != anims.end(); ++ani) {
       AnimBundle *anim = (*ani)->get_bundle();
+      cerr << "got anim " << *anim << "\n";
 
       if (chan_cat.is_info()) {
         chan_cat.info()
@@ -207,9 +209,33 @@ auto_bind(PandaNode *root_node, AnimControlCollection &controls,
       // name.
     }
   }
-  if (hierarchy_match_flags & PartGroup::HMF_ok_wrong_root_name)
+
+  if (hierarchy_match_flags & PartGroup::HMF_ok_wrong_root_name) {
+    // Continue searching through the remaining anims and parts.
+
+    while (ai != anims.end()) {
+      // Here's an anim with no matching parts.
+      if (hierarchy_match_flags & PartGroup::HMF_ok_wrong_root_name) {
+	AnimNodes::const_iterator ani;
+	for (ani = (*ai).second.begin(); ani != (*ai).second.end(); ++ani)
+	  extraAnims.insert(*ani);
+      }
+      ++ai;
+    }
+    
+    while (pi != parts.end()) {
+      // And here's a part with no matching anims.
+      if (hierarchy_match_flags & PartGroup::HMF_ok_wrong_root_name) {
+	PartNodes::const_iterator pni;
+	for (pni = (*pi).second.begin(); pni != (*pi).second.end(); ++pni)
+	  extraParts.insert(*pni);
+      }
+      ++pi;
+    }
+    
     bind_anims(extraParts, extraAnims, controls,
                hierarchy_match_flags);
+  }
 }