Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

avoid unecessary branch

Browse source
This commit is contained in:
Andrew Meadows 2016-09-16 14:50:08 -07:00
parent 61a05eb4d1
commit 49224d9698
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/physics/src/CharacterGhostObject.cpp
View file

@ -204,13 +204,9 @@ bool CharacterGhostObject::sweepTest(
CharacterSweepResult& result) const { CharacterSweepResult& result) const {
if (_world && _inWorld) { if (_world && _inWorld) {
assert(shape); assert(shape);
btScalar allowedPenetration = _world->getDispatchInfo().m_allowedCcdPenetration; btScalar allowedPenetration = _world->getDispatchInfo().m_allowedCcdPenetration;
convexSweepTest(shape, start, end, result, allowedPenetration); convexSweepTest(shape, start, end, result, allowedPenetration);
return result.hasHit();
if (result.hasHit()) {
return true;
}
} }
return false; return false;
} }