mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 20:26:43 +00:00
Code Issues Releases Wiki Activity

Merge remote branch 'scrawl/shapefix'

Browse source
This commit is contained in:
Marc Zinnschlag 2012-03-05 10:51:18 +01:00
commit e7fa1d94b8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwworld/physicssystem.cpp
View file

@ -120,7 +120,7 @@ namespace MWWorld
void PhysicsSystem::addObject (const std::string& handle, const std::string& mesh,
const Ogre::Quaternion& rotation, float scale, const Ogre::Vector3& position)
{
OEngine::Physic::RigidBody* body = mEngine->createRigidBody(mesh,handle);
OEngine::Physic::RigidBody* body = mEngine->createRigidBody(mesh,handle,scale);
mEngine->addRigidBody(body);
btTransform tr;
tr.setOrigin(btVector3(position.x,position.y,position.z));

2
libs/openengine

@ -1 +1 @@
Subproject commit 21b8456453242e132c85f92047cf9bce535c1b22
Subproject commit 5aabf22c16dab6a2230845f90fe5fdf67eeeca32