Merge branch 'master' of github.com:supertuxkart/stk-code

This commit is contained in:
hiker 2015-09-01 10:28:56 +10:00
commit 94d8706504

View File

@ -324,7 +324,6 @@ void PhysicalObject::init()
}
case MP_EXACT:
{
m_graphical_offset = Vec3(0,0,0);
extend.setY(0);
TriangleMesh* triangle_mesh = new TriangleMesh();
@ -450,7 +449,8 @@ void PhysicalObject::init()
triangle_mesh->createCollisionShape();
m_shape = &triangle_mesh->getCollisionShape();
m_triangle_mesh = triangle_mesh;
m_init_pos.setOrigin(m_init_pos.getOrigin() + m_graphical_offset);
// m_graphical_offset = Vec3(0,0,0);
break;
}
case MP_NONE: