From 787e14fade981427d1bfd00a9decb5a1a7a5b597 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 19 Jul 2023 11:10:49 +0200 Subject: [PATCH] egg2pg: Fix infinite recursion when `` used with `` 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)) {