TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

egg2pg: Fix infinite recursion when <Collide> used with <Line>

Browse Source 
Fixes #1515
This commit is contained in:
rdb 2023-07-19 11:10:49 +02:00
parent 94ebd7c953
commit 787e14fade
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/egg2pg/eggLoader.cxx
View File

@ -2982,7 +2982,8 @@ make_collision_plane(EggGroup *egg_group, CollisionNode *cnode,
cnode->add_solid(csplane); cnode->add_solid(csplane);
return; 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); EggCompositePrimitive *comp = DCAST(EggCompositePrimitive, *ci);
PT(EggGroup) temp_group = new EggGroup; PT(EggGroup) temp_group = new EggGroup;
if (comp->triangulate_into(temp_group)) { if (comp->triangulate_into(temp_group)) {