diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
| commit | 8f788c64db587e74079d812dbcea40c2bd4b91ff (patch) | |
| tree | c767e8318a9e7aded16be6cab2042f3ea11e7912 /source/gameengine/Physics | |
| parent | 36bb566d4e6e06e08d782d610d60d755cbda2396 (diff) | |
merge with trunk/2.5 at r23876
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 6 | ||||
| -rw-r--r-- | source/gameengine/Physics/Bullet/SConscript | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 8cd2ae16747..b5c50109e2a 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -593,7 +593,7 @@ bool CcdPhysicsController::ReplaceControllerShape(btCollisionShape *newShape) for(int i= 0; i < obarr.size(); i++) { ob= obarr[i]; if (ob->getCollisionShape() == newShape); { - proxy = obarr[i]->getBroadphaseHandle(); + proxy = ob->getBroadphaseHandle(); if(proxy) dw->getPairCache()->cleanProxyFromPairs(proxy,dw->getDispatcher()); @@ -1454,7 +1454,7 @@ bool CcdShapeConstructionInfo::SetMesh(RAS_MeshObject* meshobj, DerivedMesh* dm, MVert *mvert = dm->getVertArray(dm); MFace *mface = dm->getTessFaceArray(dm); - numpolys = dm->getNumFaces(dm); + numpolys = dm->getNumTessFaces(dm); numverts = dm->getNumVerts(dm); int* index = (int*)dm->getTessFaceDataArray(dm, CD_ORIGINDEX); @@ -1722,7 +1722,7 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA MVert *mvert = dm->getVertArray(dm); MFace *mface = dm->getTessFaceArray(dm); - numpolys = dm->getNumFaces(dm); + numpolys = dm->getNumTessFaces(dm); numverts = dm->getNumVerts(dm); int* index = (int*)dm->getTessFaceDataArray(dm, CD_ORIGINDEX); diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript index 49f2af1b001..976c6825351 100644 --- a/source/gameengine/Physics/Bullet/SConscript +++ b/source/gameengine/Physics/Bullet/SConscript @@ -19,6 +19,12 @@ incs += ' #source/blender/blenlib' incs += ' #intern/guardedalloc' incs += ' ' + env['BF_BULLET_INC'] -incs += ' ' + env['BF_PYTHON_INC'] -env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS']) +defs = [] + +if env['WITH_BF_PYTHON']: + incs += ' ' + env['BF_PYTHON_INC'] +else: + defs.append('DISABLE_PYTHON') + +env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS']) |