1 files changed, 40 insertions, 42 deletions

diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
index dc562941ad6..4bf133d7ac7 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
@@ -17,70 +17,68 @@ subject to the following restrictions:
 
 #include "btTriangleIndexVertexMaterialArray.h"
 
-btTriangleIndexVertexMaterialArray::btTriangleIndexVertexMaterialArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,
-                                   int numVertices,btScalar* vertexBase,int vertexStride,
-                                   int numMaterials, unsigned char* materialBase, int materialStride,
-                                   int* triangleMaterialsBase, int materialIndexStride) :
-btTriangleIndexVertexArray(numTriangles, triangleIndexBase, triangleIndexStride, numVertices, vertexBase, vertexStride)
+btTriangleIndexVertexMaterialArray::btTriangleIndexVertexMaterialArray(int numTriangles, int* triangleIndexBase, int triangleIndexStride,
+																	   int numVertices, btScalar* vertexBase, int vertexStride,
+																	   int numMaterials, unsigned char* materialBase, int materialStride,
+																	   int* triangleMaterialsBase, int materialIndexStride) : btTriangleIndexVertexArray(numTriangles, triangleIndexBase, triangleIndexStride, numVertices, vertexBase, vertexStride)
 {
-    btMaterialProperties mat;
+	btMaterialProperties mat;
 
-    mat.m_numMaterials = numMaterials;
-    mat.m_materialBase = materialBase;
-    mat.m_materialStride = materialStride;
+	mat.m_numMaterials = numMaterials;
+	mat.m_materialBase = materialBase;
+	mat.m_materialStride = materialStride;
 #ifdef BT_USE_DOUBLE_PRECISION
-    mat.m_materialType = PHY_DOUBLE;
+	mat.m_materialType = PHY_DOUBLE;
 #else
-    mat.m_materialType = PHY_FLOAT;
+	mat.m_materialType = PHY_FLOAT;
 #endif
 
-    mat.m_numTriangles = numTriangles;
-    mat.m_triangleMaterialsBase = (unsigned char *)triangleMaterialsBase;
-    mat.m_triangleMaterialStride = materialIndexStride;
-    mat.m_triangleType = PHY_INTEGER;
+	mat.m_numTriangles = numTriangles;
+	mat.m_triangleMaterialsBase = (unsigned char*)triangleMaterialsBase;
+	mat.m_triangleMaterialStride = materialIndexStride;
+	mat.m_triangleType = PHY_INTEGER;
 
-    addMaterialProperties(mat);
+	addMaterialProperties(mat);
 }
 
-
-void btTriangleIndexVertexMaterialArray::getLockedMaterialBase(unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
-                                   unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
+void btTriangleIndexVertexMaterialArray::getLockedMaterialBase(unsigned char** materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+															   unsigned char** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
 {
-    btAssert(subpart< getNumSubParts() );
+	btAssert(subpart < getNumSubParts());
 
-    btMaterialProperties& mats = m_materials[subpart];
+	btMaterialProperties& mats = m_materials[subpart];
 
-    numMaterials = mats.m_numMaterials;
-    (*materialBase) = (unsigned char *) mats.m_materialBase;
+	numMaterials = mats.m_numMaterials;
+	(*materialBase) = (unsigned char*)mats.m_materialBase;
 #ifdef BT_USE_DOUBLE_PRECISION
-    materialType = PHY_DOUBLE;
+	materialType = PHY_DOUBLE;
 #else
-    materialType = PHY_FLOAT;
+	materialType = PHY_FLOAT;
 #endif
-    materialStride = mats.m_materialStride;
+	materialStride = mats.m_materialStride;
 
-    numTriangles = mats.m_numTriangles;
-    (*triangleMaterialBase) = (unsigned char *)mats.m_triangleMaterialsBase;
-    triangleMaterialStride = mats.m_triangleMaterialStride;
-    triangleType = mats.m_triangleType;
+	numTriangles = mats.m_numTriangles;
+	(*triangleMaterialBase) = (unsigned char*)mats.m_triangleMaterialsBase;
+	triangleMaterialStride = mats.m_triangleMaterialStride;
+	triangleType = mats.m_triangleType;
 }
 
-void btTriangleIndexVertexMaterialArray::getLockedReadOnlyMaterialBase(const unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
-                                           const unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
+void btTriangleIndexVertexMaterialArray::getLockedReadOnlyMaterialBase(const unsigned char** materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+																	   const unsigned char** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
 {
-    btMaterialProperties& mats = m_materials[subpart];
+	btMaterialProperties& mats = m_materials[subpart];
 
-    numMaterials = mats.m_numMaterials;
-    (*materialBase) = (const unsigned char *) mats.m_materialBase;
+	numMaterials = mats.m_numMaterials;
+	(*materialBase) = (const unsigned char*)mats.m_materialBase;
 #ifdef BT_USE_DOUBLE_PRECISION
-    materialType = PHY_DOUBLE;
+	materialType = PHY_DOUBLE;
 #else
-    materialType = PHY_FLOAT;
+	materialType = PHY_FLOAT;
 #endif
-    materialStride = mats.m_materialStride;
+	materialStride = mats.m_materialStride;
 
-    numTriangles = mats.m_numTriangles;
-    (*triangleMaterialBase) = (const unsigned char *)mats.m_triangleMaterialsBase;
-    triangleMaterialStride = mats.m_triangleMaterialStride;
-    triangleType = mats.m_triangleType;
+	numTriangles = mats.m_numTriangles;
+	(*triangleMaterialBase) = (const unsigned char*)mats.m_triangleMaterialsBase;
+	triangleMaterialStride = mats.m_triangleMaterialStride;
+	triangleType = mats.m_triangleType;
 }