Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2006-06-12 22:47:56 +0400
committerErwin Coumans <blender@erwincoumans.com>2006-06-12 22:47:56 +0400
commit3458ed475360cfe6676cbbe37345da9223e9be5b (patch)
treebfa5972836feb2d08a1612c2b7e157f4f93139ad /extern
parente65df3e89d4e20151967ce0c7677b3c6de1ac227 (diff)
Bullet, bugfix: don't simulate when substeps are set to 0
Diffstat (limited to 'extern')
-rw-r--r--extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
index 4b4d3f15dae..e4e7a998ad8 100644
--- a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
+++ b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
@@ -503,6 +503,10 @@ void CcdPhysicsEnvironment::beginFrame()
bool CcdPhysicsEnvironment::proceedDeltaTime(double curTime,float timeStep)
{
+ //don't simulate without timesubsteps
+ if (m_numTimeSubSteps<1)
+ return true;
+
//printf("proceedDeltaTime\n");