From de86b7097fecf2a8b71d93a5edf20a38f4b4587c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 12 Mar 2014 14:48:47 +0600 Subject: Fix T39104: 2 clothes on a collision object cause crash This was caused by static variables used in plNearestPoints(). For now solved by making the solvers allocated in the stack, seems no noticeable affect on the simulation speed so far. --- extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extern') diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp index cf735569a9d..893453bddaf 100644 --- a/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp +++ b/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp @@ -354,11 +354,11 @@ double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float // btVoronoiSimplexSolver sGjkSimplexSolver; // btGjkEpaPenetrationDepthSolver penSolverPtr; - static btSimplexSolverInterface sGjkSimplexSolver; + /*static*/ btSimplexSolverInterface sGjkSimplexSolver; sGjkSimplexSolver.reset(); - static btGjkEpaPenetrationDepthSolver Solver0; - static btMinkowskiPenetrationDepthSolver Solver1; + /*static*/ btGjkEpaPenetrationDepthSolver Solver0; + /*static*/ btMinkowskiPenetrationDepthSolver Solver1; btConvexPenetrationDepthSolver* Solver = NULL; -- cgit v1.2.3