Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apply forgotten patch in a closed issue

Browse Source 
http://code.google.com/p/bullet/issues/detail?id=573

Thanks to Andres Traks for the reminder!
This commit is contained in:
erwincoumans
2012-06-29 22:36:38 +00:00
parent f9908667eb
commit 78e1058b68
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Extras/AllBulletDemosOSX/src/BTDemo.mm
View File

@@ -314,7 +314,9 @@ static BOOL DrawContacts = NO;
} }
- (void) specialKeyReleased: (unsigned) key - (void) specialKeyReleased: (unsigned) key
{} {
[_demo demo]->specialKeyboardUp(key,(int)MousePosition.x, (int)MousePosition.y );
}
- (void) mouseButtonPressed: (unsigned) mouseButton - (void) mouseButtonPressed: (unsigned) mouseButton
{ {

3
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
View File

@@ -240,7 +240,7 @@ m_solverIslandCallback ( NULL )
{ {
void* mem = btAlignedAlloc(sizeof(InplaceSolverIslandCallback),16); 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_ownsConstraintSolver = false;
m_constraintSolver = solver; m_constraintSolver = solver;
m_solverIslandCallback->m_solver = solver;
} }
btConstraintSolver* btDiscreteDynamicsWorld::getConstraintSolver() btConstraintSolver* btDiscreteDynamicsWorld::getConstraintSolver()