ok, apparently didn't commit this either. apparently includes a merge with trunk...
[blender-staging.git] / source / gameengine / Physics / Bullet / CcdPhysicsController.cpp
index 69b63affeefb3d2e8783c827568eee00caee0b7f..97d9d488db98f3d4676b3491fec8ce353c6af704 100644 (file)
@@ -1470,10 +1470,10 @@ 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);
+       int* index = (int*)dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
 
        m_shapeType = (polytope) ? PHY_SHAPE_POLYTOPE : PHY_SHAPE_MESH;
 
@@ -1738,10 +1738,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;
@@ -1750,7 +1750,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);