From 787e14fade981427d1bfd00a9decb5a1a7a5b597 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 19 Jul 2023 11:10:49 +0200
Subject: [PATCH 1/2] egg2pg: Fix infinite recursion when `<Collide>` used with
 `<Line>`

Fixes #1515
---
 panda/src/egg2pg/eggLoader.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx
index ac69a976a2..b1beac16d9 100644
--- a/panda/src/egg2pg/eggLoader.cxx
+++ b/panda/src/egg2pg/eggLoader.cxx
@@ -2982,7 +2982,8 @@ make_collision_plane(EggGroup *egg_group, CollisionNode *cnode,
           cnode->add_solid(csplane);
           return;
         }
-      } else if ((*ci)->is_of_type(EggCompositePrimitive::get_class_type())) {
+      } else if ((*ci)->is_of_type(EggCompositePrimitive::get_class_type()) &&
+                !(*ci)->is_of_type(EggLine::get_class_type())) {
         EggCompositePrimitive *comp = DCAST(EggCompositePrimitive, *ci);
         PT(EggGroup) temp_group = new EggGroup;
         if (comp->triangulate_into(temp_group)) {

From 52c704f79dee0f2ced37a46ea0fd479be41bf02f Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Fri, 21 Jul 2023 19:42:07 +0200
Subject: [PATCH 2/2] Update BACKERS.md

[skip ci]
---
 BACKERS.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BACKERS.md b/BACKERS.md
index aeee271a44..960141998c 100644
--- a/BACKERS.md
+++ b/BACKERS.md
@@ -17,6 +17,8 @@ This is a list of all the people who are contributing financially to Panda3D.  I
 * Max Voss
 * Hawkheart
 * Veronica
+* Cody Sevier
+* Marek Alexa
 
 ## Enthusiasts
 
@@ -28,6 +30,7 @@ This is a list of all the people who are contributing financially to Panda3D.  I
 * SureBet
 * Gyedo Jeon
 * GameDev JONI
+* Max Rodriguez
 
 ## Backers