diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-26 22:53:26 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-26 22:53:26 +0400 |
| commit | db90946d82d32bead6252f8bdc86b9daa5f45f07 (patch) | |
| tree | d5b3f252d04334554d27aa8094f7669d230fce67 /extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp | |
| parent | b542721f329304f2dc582436b3a5de92dc045956 (diff) | |
svn merge -r 16608:16749 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2008-jaguarandi
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp index f828d28e18c..fb81c8a5bde 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp @@ -26,7 +26,7 @@ m_collisionMargin(CONVEX_DISTANCE_MARGIN) void btConvexInternalShape::setLocalScaling(const btVector3& scaling) { - m_localScaling = scaling; + m_localScaling = scaling.absolute(); } |