mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-27 07:03:36 -04:00
Merge branch 'release/1.10.x'
This commit is contained in:
commit
c6f930a379
@ -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
|
||||
|
||||
|
@ -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)) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user