merge with 2.5 at r22793

2009-08-26 10:27:04 +00:00
parent a34ffefa00 d893b0f9ff
commit de7f08cc41
994 changed files with 59413 additions and 26223 deletions
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -1829,8 +1829,6 @@ bool CcdShapeConstructionInfo::UpdateMesh(class KX_GameObject* gameobj, class RA
 			}

 			for(mf= mface, i=0; i < numpolys; mf++, i++) {
-				unsigned int *fv = &mf->v1;
-
 				if(mf->v4) {
 					fv_pt= quad_verts;
 					*poly_index_pt++ = *poly_index_pt++ = index[i];