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

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2023-07-21 19:42:39 +02:00
commit c6f930a379
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BACKERS.md
View File

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

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

@ -3030,7 +3030,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)) {