noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

bullet: Sync with upstream 2.89

Browse Source 
This allows distro unbundling again for distros that ship Bullet 2.89+.
This commit is contained in:
Rémi Verschelde
2020-01-08 18:05:43 +01:00
parent 98222130bf
commit 29e07dfa4e
90 changed files with 11215 additions and 3083 deletions
Download Patch File Download Diff File Expand all files Collapse all files
thirdparty/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
Vendored
+1 -1
View File
@@ -139,7 +139,7 @@ public:
if (TestAabbAgainstAabb2(aabbMin0, aabbMax0, aabbMin1, aabbMax1))
{
btCollisionObjectWrapper compoundWrap(this->m_compoundColObjWrap, childShape, m_compoundColObjWrap->getCollisionObject(), newChildWorldTrans, -1, index);
btCollisionObjectWrapper compoundWrap(this->m_compoundColObjWrap, childShape, m_compoundColObjWrap->getCollisionObject(), newChildWorldTrans, childTrans, -1, index);
btCollisionAlgorithm* algo = 0;
bool allocatedAlgorithm = false;