From 49224d9698284b96d6496a08a5b565b35a56069f Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 16 Sep 2016 14:50:08 -0700 Subject: [PATCH] avoid unecessary branch --- libraries/physics/src/CharacterGhostObject.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/physics/src/CharacterGhostObject.cpp b/libraries/physics/src/CharacterGhostObject.cpp index bdd147fb74..6529f2c944 100755 --- a/libraries/physics/src/CharacterGhostObject.cpp +++ b/libraries/physics/src/CharacterGhostObject.cpp @@ -204,13 +204,9 @@ bool CharacterGhostObject::sweepTest( CharacterSweepResult& result) const { if (_world && _inWorld) { assert(shape); - btScalar allowedPenetration = _world->getDispatchInfo().m_allowedCcdPenetration; convexSweepTest(shape, start, end, result, allowedPenetration); - - if (result.hasHit()) { - return true; - } + return result.hasHit(); } return false; }