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
diff options
context:
space:
mode:
Diffstat (limited to 'extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp')
-rw-r--r--extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
index 700419f48b5..678536cd905 100644
--- a/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
+++ b/extern/bullet/BulletDynamics/ConstraintSolver/SorLcp.cpp
@@ -590,8 +590,8 @@ void SolveInternal1 (float global_cfm,
const ContactSolverInfo& solverInfo)
{
- int numIter = 30;
- float sOr = 1.3f;
+ int numIter = solverInfo.m_numIterations;
+ float sOr = solverInfo.m_sor;
int i,j;
@@ -756,7 +756,7 @@ void SolveInternal1 (float global_cfm,
// scale CFM
for (i=0; i<m; i++)
- cfm[i] =0;//*= stepsize1;
+ cfm[i] *= stepsize1;
// load lambda from the value saved on the previous iteration
dRealAllocaArray (lambda,m);