[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22265] branches/bmesh/blender/source/ gameengine/Physics/Bullet/CcdPhysicsController.cpp: compile fix for the game engine, which I suppose I should re-enable in my local build again

[Joseph Eagar]

Revision: 22265
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22265
Author:   joeedh
Date:     2009-08-06 17:54:57 +0200 (Thu, 06 Aug 2009)

Log Message:
-----------
compile fix for the game engine, which I suppose I should re-enable in my local build again

Modified Paths:
--------------
    branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp

Modified: branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===================================================================
--- branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp	2009-08-06 14:23:48 UTC (rev 22264)
+++ branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp	2009-08-06 15:54:57 UTC (rev 22265)
@@ -1453,10 +1453,10 @@
 	}
 
 	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 @@
 		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 @@
 
 		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);