From 78e1058b68020debf8330be18c77c5107714993b Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Fri, 29 Jun 2012 22:36:38 +0000 Subject: [PATCH] apply forgotten patch in a closed issue http://code.google.com/p/bullet/issues/detail?id=573 Thanks to Andres Traks for the reminder! --- Extras/AllBulletDemosOSX/src/BTDemo.mm | 4 +++- src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Extras/AllBulletDemosOSX/src/BTDemo.mm b/Extras/AllBulletDemosOSX/src/BTDemo.mm index c961d18c4..ebdab213b 100644 --- a/Extras/AllBulletDemosOSX/src/BTDemo.mm +++ b/Extras/AllBulletDemosOSX/src/BTDemo.mm @@ -314,7 +314,9 @@ static BOOL DrawContacts = NO; } - (void) specialKeyReleased: (unsigned) key -{} +{ + [_demo demo]->specialKeyboardUp(key,(int)MousePosition.x, (int)MousePosition.y ); +} - (void) mouseButtonPressed: (unsigned) mouseButton { diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp index 83cd9a275..9019f7b15 100644 --- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp +++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp @@ -240,7 +240,7 @@ m_solverIslandCallback ( NULL ) { void* mem = btAlignedAlloc(sizeof(InplaceSolverIslandCallback),16); - m_solverIslandCallback = new (mem) InplaceSolverIslandCallback (constraintSolver, m_stackAlloc, dispatcher); + m_solverIslandCallback = new (mem) InplaceSolverIslandCallback (m_constraintSolver, m_stackAlloc, dispatcher); } } @@ -1194,6 +1194,7 @@ void btDiscreteDynamicsWorld::setConstraintSolver(btConstraintSolver* solver) } m_ownsConstraintSolver = false; m_constraintSolver = solver; + m_solverIslandCallback->m_solver = solver; } btConstraintSolver* btDiscreteDynamicsWorld::getConstraintSolver()