From e27ed62d8be3cd7e04d3fbc9a26fef19ddc22ba6 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 13 Nov 2003 06:11:43 +0000
Subject: [PATCH] fix sphere-trigger

---
 panda/src/egg/parser.yxx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/panda/src/egg/parser.yxx b/panda/src/egg/parser.yxx
index c00519c982..66d9354f57 100644
--- a/panda/src/egg/parser.yxx
+++ b/panda/src/egg/parser.yxx
@@ -1055,7 +1055,15 @@ cs_type:
   if (f == EggGroup::CST_none) {
     eggyywarning("Unknown collision solid type " + strval);
   } else {
-    group->set_cs_type(f);
+    if (f == EggGroup::CST_polyset && group->get_cs_type() != EggGroup::CST_none) {
+      // By convention, a CST_polyset doesn't replace any existing
+      // contradictory type, so ignore it if this happens.  This
+      // allows the artist to place, for instance, <ObjectType> {
+      // sphere } and <ObjectType> { trigger } together.
+
+    } else {
+      group->set_cs_type(f);
+    }
   }
 }
         ;