From 0c30cbbe7b6c54d89bb62dc5597b5790385372da Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 27 Apr 2006 14:50:47 +0000
Subject: [PATCH] fix shground & dupe-floor

---
 panda/src/egg2pg/eggLoader.cxx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx
index 90e22f0866..0973accf1e 100644
--- a/panda/src/egg2pg/eggLoader.cxx
+++ b/panda/src/egg2pg/eggLoader.cxx
@@ -1592,10 +1592,16 @@ make_node(EggGroup *egg_group, PandaNode *parent) {
     make_collision_solids(egg_group, egg_group, (CollisionNode *)node.p());
     if ((egg_group->get_collide_flags() & EggGroup::CF_keep) != 0) {
       // If we also specified to keep the geometry, continue the
-      // traversal.
+      // traversal.  In this case, we create a new PandaNode to be the
+      // parent of the visible geometry and the collision geometry.
+      PandaNode *combined = new PandaNode("");
+      parent->add_child(combined);
+      combined->add_child(node);
+      node = combined;
+      
       EggGroup::const_iterator ci;
       for (ci = egg_group->begin(); ci != egg_group->end(); ++ci) {
-        make_node(*ci, parent);
+        make_node(*ci, combined);
       }
     }