diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-07 09:47:34 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-07 09:47:34 +0400 |
| commit | 82432d0d99f2101ee2ceba86bdc49669b5fa306f (patch) | |
| tree | ada47d0a65cb7614ead93fcdbb3421e5398ff3dc /source/gameengine/Physics | |
| parent | 859c5a42f0fe8b9bec0d3ddce1612942942619a7 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge from trunk at r31523
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 421a9fc64b8..26265cb7e74 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -1417,11 +1417,11 @@ bool CcdShapeConstructionInfo::SetMesh(RAS_MeshObject* meshobj, DerivedMesh* dm, } MVert *mvert = dm->getVertArray(dm); - MFace *mface = dm->getFaceArray(dm); - numpolys = dm->getNumFaces(dm); + MFace *mface = dm->getTessFaceArray(dm); + numpolys = dm->getNumTessFaces(dm); numverts = dm->getNumVerts(dm); - int* index = (int*)dm->getFaceDataArray(dm, CD_ORIGINDEX); - MTFace *tface = (MTFace *)dm->getFaceDataArray(dm, CD_MTFACE); + int* index = (int*)dm->getTessFaceDataArray(dm, CD_ORIGINDEX); + MTFace *tface = (MTFace *)dm->getTessFaceDataArray(dm, CD_MTFACE); m_shapeType = (polytope) ? PHY_SHAPE_POLYTOPE : PHY_SHAPE_MESH; @@ -1715,10 +1715,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); - numpolys = dm->getNumFaces(dm); + MFace *mface = dm->getTessFaceArray(dm); + numpolys = dm->getNumTessFaces(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; @@ -1727,7 +1727,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); |