diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-16 18:21:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-16 18:21:58 +0400 |
| commit | a1cf7988c1d71b5b0a975eff1e5de1d744143606 (patch) | |
| tree | 18b885d0d35b583b2ee7e90eb79ae26675f20fa1 /source/gameengine/Physics | |
| parent | 2d40b8d56ff100b71dac7c4694f6115dcc0b01b5 (diff) | |
| parent | 1025b750ee873edee48b03653ab0e6a7988245d0 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20855:20928
Sequencer changes from source/blender/src coming next
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 3e20203a4cc..3c41a856660 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -979,6 +979,7 @@ void CcdPhysicsController::setScaling(float scaleX,float scaleY,float scaleZ) if (m_object && m_object->getCollisionShape()) { + m_object->activate(true); // without this, sleeping objects scale wont be applied in bullet if python changes the scale - Campbell. m_object->getCollisionShape()->setLocalScaling(m_cci.m_scaling); //printf("no inertia recalc for fixed objects with mass=0\n"); |