mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 04:15:35 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master' into next

Browse source
This commit is contained in:
Marc Zinnschlag 2013-03-21 22:07:37 +01:00
commit b2f6f67d53
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/openengine/bullet/physic.cpp
View file

@ -608,6 +608,14 @@ namespace Physic
btTransform trans; btTransform trans;
trans.setIdentity(); trans.setIdentity();
shape->mCollisionShape->getAabb(trans, min, max); if (shape->mRaycastingShape)
shape->mRaycastingShape->getAabb(trans, min, max);
else if (shape->mCollisionShape)
shape->mCollisionShape->getAabb(trans, min, max);
else
{
min = btVector3(0,0,0);
max = btVector3(0,0,0);
}
} }
}} }}