diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 18:54:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 18:54:29 +0400 |
| commit | 619927605355a0b66e1ecd8f8a8bf1fe31b68d07 (patch) | |
| tree | 384a5b47f09aeeb30f984216e0aae6aeb68c2e0f /source/gameengine/Physics | |
| parent | 2dc6b8f835b87480a9451c91e684271a55554006 (diff) | |
| parent | 3c43e8e50ac991b082c143c634e4776aaca02db1 (diff) | |
svn merge -r37800:37900 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index b67f9889ce8..8f6e463bd3f 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -2142,6 +2142,7 @@ btCollisionShape* CcdShapeConstructionInfo::CreateBulletShape(btScalar margin, b } collisionShape = compoundShape; } + break; } return collisionShape; } diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index 51e00b9111f..18e1282b111 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -128,7 +128,7 @@ protected: virtual void setFixedTimeStep(bool useFixedTimeStep,float fixedTimeStep) { //based on DEFAULT_PHYSICS_TIC_RATE of 60 hertz - setNumTimeSubSteps(fixedTimeStep/60.f); + setNumTimeSubSteps((int)(fixedTimeStep / 60.f)); } //returns 0.f if no fixed timestep is used |