diff options
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 10 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_NavMeshObject.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 16 |
3 files changed, 14 insertions, 14 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index c22dc1a66cd..1cecac4001c 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -911,16 +911,16 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene* scene, MVert *mvert = dm->getVertArray(dm); int totvert = dm->getNumVerts(dm); - MFace *mface = dm->getFaceArray(dm); - MTFace *tface = static_cast<MTFace*>(dm->getFaceDataArray(dm, CD_MTFACE)); - MCol *mcol = static_cast<MCol*>(dm->getFaceDataArray(dm, CD_MCOL)); + MFace *mface = dm->getTessFaceArray(dm); + MTFace *tface = static_cast<MTFace*>(dm->getTessFaceDataArray(dm, CD_MTFACE)); + MCol *mcol = static_cast<MCol*>(dm->getTessFaceDataArray(dm, CD_MCOL)); float (*tangent)[4] = NULL; - int totface = dm->getNumFaces(dm); + int totface = dm->getNumTessFaces(dm); const char *tfaceName = ""; if(tface) { DM_add_tangent_layer(dm); - tangent = (float(*)[4])dm->getFaceDataArray(dm, CD_TANGENT); + tangent = (float(*)[4])dm->getTessFaceDataArray(dm, CD_TANGENT); } meshobj = new RAS_MeshObject(mesh); diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index f92319e508b..e6f8d7175dc 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -112,7 +112,7 @@ bool KX_NavMeshObject::BuildVertIndArrays(float *&vertices, int& nverts, { DerivedMesh* dm = mesh_create_derived_no_virtual(KX_GetActiveScene()->GetBlenderScene(), GetBlenderObject(), NULL, CD_MASK_MESH); - int* recastData = (int*) dm->getFaceDataArray(dm, CD_RECAST); + int* recastData = (int*) dm->getTessFaceDataArray(dm, CD_RECAST); if (recastData) { int *dtrisToPolysMap=NULL, *dtrisToTrisMap=NULL, *trisToFacesMap=NULL; diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 4b3e2ea33a3..a22122a245e 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -1434,11 +1434,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; @@ -1734,10 +1734,10 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA * */ 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; @@ -1746,7 +1746,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); |