mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-19 21:23:54 +00:00
Merge remote-tracking branch 'scrawl/master' into next
This commit is contained in:
commit
b2f6f67d53
1 changed files with 9 additions and 1 deletions
|
@ -608,6 +608,14 @@ namespace Physic
|
|||
btTransform trans;
|
||||
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);
|
||||
}
|
||||
}
|
||||
}}
|
||||
|
|
Loading…
Reference in a new issue