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

Minor fixes to keep trunk compiling, while doing the refactoring.

Browse Source
This commit is contained in:
erwin.coumans
2008-12-01 06:55:27 +00:00
parent e80feca36b
commit 7341c6ee7e
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
View File

@@ -32,7 +32,7 @@ subject to the following restrictions:
#include "btSolverBody.h" #include "btSolverBody.h"
#include "btSolverConstraint.h" #include "btSolverConstraint.h"
#include "LinearMath/btAlignedObjectArray.h" #include "LinearMath/btAlignedObjectArray.h"
#include <string.h> //for memset
btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver() btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver()
:m_btSeed2(0) :m_btSeed2(0)

4
src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.cpp
View File

@@ -1,3 +1,5 @@
#ifdef CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008
/* /*
Bullet Continuous Collision Detection and Physics Library - Parallel solver Bullet Continuous Collision Detection and Physics Library - Parallel solver
Copyright (c) 2007 Starbreeze Studios Copyright (c) 2007 Starbreeze Studios
@@ -1963,3 +1965,5 @@ void processSolverTask(void* userPtr, void* lsMemory)
// btAssert(0); // btAssert(0);
} }
} }
#endif //CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008

3
src/BulletMultiThreaded/SpuSolverTask/SpuParallellSolverTask.h
View File

@@ -1,3 +1,4 @@
#ifdef CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008
/* /*
Bullet Continuous Collision Detection and Physics Library - Parallel solver Bullet Continuous Collision Detection and Physics Library - Parallel solver
Copyright (c) 2007 Starbreeze Studios Copyright (c) 2007 Starbreeze Studios
@@ -248,3 +249,5 @@ inline bool constraintTypeSupported(btTypedConstraintType type)
} }
#endif #endif
#endif //CONSTRAINT_SOLVER_IS_BEING_REFACTORED_DURING_DECEMBER_2008