teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Doors no longer get hindered by actors that have collision disabled

Browse source
This commit is contained in:
scrawl 2013-07-31 02:31:00 +02:00
parent 04b90b7d14
commit aa555b3086
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -531,8 +531,10 @@ namespace Physic
const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1)
{
const RigidBody* body = dynamic_cast<const RigidBody*>(colObj0Wrap->m_collisionObject);
if (body)
if (body && !(colObj0Wrap->m_collisionObject->getBroadphaseHandle()->m_collisionFilterGroup
& CollisionType_Raycasting))
mResult.push_back(body->mName);
return 0.f;
}
#else
@ -540,7 +542,8 @@ namespace Physic
const btCollisionObject* col1, int partId1, int index1)
{
const RigidBody* body = dynamic_cast<const RigidBody*>(col0);
if (body)
if (body && !(col0->getBroadphaseHandle()->m_collisionFilterGroup
& CollisionType_Raycasting))
mResult.push_back(body->mName);
return 0.f;
}