1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 06:35:30 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Marc Zinnschlag 2015-05-10 11:50:59 +02:00
commit 53c3df16e5

View File

@ -480,7 +480,7 @@ namespace Physic
//#endif
bool needDelete = false;
if (btBvhTriangleMeshShape* triangleShape = dynamic_cast<btBvhTriangleMeshShape*>(shape->mCollisionShape))
if (btBvhTriangleMeshShape* triangleShape = dynamic_cast<btBvhTriangleMeshShape*>(collisionShape))
{
btScaledBvhTriangleMeshShape* scaled = new btScaledBvhTriangleMeshShape(triangleShape, btVector3(scale,scale,scale));
collisionShape = scaled;