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 diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx index f5f5cf40ac..e0dca70801 100644 --- a/panda/src/egg2pg/eggLoader.cxx +++ b/panda/src/egg2pg/eggLoader.cxx @@ -3030,7 +3030,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)) {