Skip to content

Commit

Permalink
UPBGE: Fix assertions in aciton and physics.
Browse files Browse the repository at this point in the history
  • Loading branch information
panzergame committed Sep 14, 2017
1 parent 9a092bd commit 9cc810a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion source/gameengine/Ketsji/BL_Action.cpp
Expand Up @@ -416,7 +416,7 @@ void BL_Action::Update(float curtime, bool applyToObject)
}
}

BLI_assert(m_localframe < minFrame || m_localframe > maxFrame);
BLI_assert(m_localframe >= minFrame && m_localframe <= maxFrame);

m_appliedToObject = applyToObject;
// In case of culled armatures (doesn't requesting to transform the object) we only manages time.
Expand Down
3 changes: 0 additions & 3 deletions source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Expand Up @@ -1590,9 +1590,6 @@ PHY_IPhysicsController *CcdPhysicsController::GetReplicaForSensors()
// The replication of object physics controller is done in KX_BulletPhysicsController::GetReplica()
CcdConstructionInfo cinfo = m_cci;

// Controllers used by sensors aren't using shape info.
BLI_assert(m_shapeInfo);

if (m_collisionShape) {
switch (m_collisionShape->getShapeType())
{
Expand Down

0 comments on commit 9cc810a

Please sign in to comment.