diff options
author | Joseph Eagar <joeedh@gmail.com> | 2009-08-06 19:54:57 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2009-08-06 19:54:57 +0400 |
commit | f0a31d7197963f0225fa705f0d420de39c30cb26 (patch) | |
tree | 60eab19f2fdde9c1a2ca5c30acf2ecf1d81712f4 /source/gameengine/Physics | |
parent | 7e6662e60ca9bd30dd11826ebceceea6dec85103 (diff) |
compile fix for the game engine, which I suppose I should re-enable in my local build again
Diffstat (limited to 'source/gameengine/Physics')
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 20e830c9dc3..ac16d911a0e 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -1453,10 +1453,10 @@ bool CcdShapeConstructionInfo::SetMesh(RAS_MeshObject* meshobj, DerivedMesh* dm, } MVert *mvert = dm->getVertArray(dm); - MFace *mface = dm->getFaceArray(dm); + MFace *mface = dm->getTessFaceArray(dm); numpolys = dm->getNumFaces(dm); numverts = dm->getNumVerts(dm); - int* index = (int*)dm->getFaceDataArray(dm, CD_ORIGINDEX); + int* index = (int*)dm->getTessFaceDataArray(dm, CD_ORIGINDEX); m_shapeType = (polytope) ? PHY_SHAPE_POLYTOPE : PHY_SHAPE_MESH; @@ -1721,10 +1721,10 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA DerivedMesh* dm= gameobj->GetDeformer()->GetFinalMesh(); MVert *mvert = dm->getVertArray(dm); - MFace *mface = dm->getFaceArray(dm); + MFace *mface = dm->getTessFaceArray(dm); numpolys = dm->getNumFaces(dm); numverts = dm->getNumVerts(dm); - int* index = (int*)dm->getFaceDataArray(dm, CD_ORIGINDEX); + int* index = (int*)dm->getTessFaceDataArray(dm, CD_ORIGINDEX); MFace *mf; MVert *mv; @@ -1733,7 +1733,7 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA if(CustomData_has_layer(&dm->faceData, CD_MTFACE)) { - MTFace *tface = (MTFace *)dm->getFaceDataArray(dm, CD_MTFACE); + MTFace *tface = (MTFace *)dm->getTessFaceDataArray(dm, CD_MTFACE); MTFace *tf; vector<bool> vert_tag_array(numverts, false); |