mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-28 20:39:40 +00:00
Code Issues Releases Wiki Activity

Disable collision for placeable objects (Fixes #1634)

Browse source
This commit is contained in:
scrawl 2015-01-16 14:59:42 +01:00
parent 1869d37cfc
commit b77558726a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -461,7 +461,9 @@ namespace Physic
BulletShapeManager::getSingletonPtr()->load(outputstring,"General"); BulletShapeManager::getSingletonPtr()->load(outputstring,"General");
BulletShapePtr shape = BulletShapeManager::getSingleton().getByName(outputstring,"General"); BulletShapePtr shape = BulletShapeManager::getSingleton().getByName(outputstring,"General");
if (placeable && !raycasting && shape->mCollisionShape && shape->mAutogenerated) // TODO: add option somewhere to enable collision for placeable meshes
if (placeable && !raycasting && shape->mCollisionShape)
return NULL; return NULL;
if (!shape->mCollisionShape && !raycasting) if (!shape->mCollisionShape && !raycasting)