godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

bullet: Sync with upstream 3.21

Browse Source 
Remove upstreamed patches. Add a new patch to fix a new warning.
This commit is contained in:
Rémi Verschelde
2022-01-06 23:37:49 +01:00
parent c58391c9d1
commit 305d7bd49e
213 changed files with 320 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
thirdparty/bullet/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp vendored
View File

@@ -1,6 +1,6 @@
/*
Bullet Continuous Collision Detection and Physics Library
Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
Copyright (c) 2003-2006 Erwin Coumans https://bulletphysics.org
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from the use of this software.
@@ -195,8 +195,7 @@ void btSoftBodyConcaveCollisionAlgorithm::processCollision(const btCollisionObje
if (triBody->getCollisionShape()->isConcave())
{
const btCollisionObject* triOb = triBody->getCollisionObject();
const btConcaveShape* concaveShape = static_cast<const btConcaveShape*>(triOb->getCollisionShape());
const btConcaveShape* concaveShape = static_cast<const btConcaveShape*>(triBody->getCollisionShape());
// if (convexBody->getCollisionShape()->isConvex())
{