Merge remote-tracking branch 'origin/master' into splitImpulse

This commit is contained in:
Xuchen Han
2020-04-27 20:29:06 -07:00
126 changed files with 563 additions and 70 deletions

View File

@@ -29,6 +29,10 @@ subject to the following restrictions:
static inline btDbvtNode* buildTreeBottomUp(btAlignedObjectArray<btDbvtNode*>& leafNodes, btAlignedObjectArray<btAlignedObjectArray<int> >& adj)
{
int N = leafNodes.size();
if (N == 0)
{
return NULL;
}
while (N > 1)
{
btAlignedObjectArray<bool> marked;