From 46be84741c7a9d5695ec9251c18fff633ce75a5c Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Fri, 1 Apr 2011 18:09:31 +0000
Subject: [PATCH] fix an issue in the ConvexDecompositionDemo, replacing
 std::vector by btAlignedObjectArray.

---
 .../ConvexDecompositionDemo.cpp                       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
index 05456d1a2..5c0b88d53 100644
--- a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
+++ b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
@@ -293,24 +293,25 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
 					}
 
 				//	float mass = 1.f;
-					//float collisionMargin = 0.01f;
+					
 
 //this is a tools issue: due to collision margin, convex objects overlap, compensate for it here:
 //#define SHRINK_OBJECT_INWARDS 1
 #ifdef SHRINK_OBJECT_INWARDS
 
+					float collisionMargin = 0.01f;
 					
-					std::vector<btVector3> planeEquations;
+					btAlignedObjectArray<btVector3> planeEquations;
 					btGeometryUtil::getPlaneEquationsFromVertices(vertices,planeEquations);
 
-					std::vector<btVector3> shiftedPlaneEquations;
+					btAlignedObjectArray<btVector3> shiftedPlaneEquations;
 					for (int p=0;p<planeEquations.size();p++)
 					{
 						btVector3 plane = planeEquations[p];
-						plane[3] += 5*collisionMargin;
+						plane[3] += collisionMargin;
 						shiftedPlaneEquations.push_back(plane);
 					}
-					std::vector<btVector3> shiftedVertices;
+					btAlignedObjectArray<btVector3> shiftedVertices;
 					btGeometryUtil::getVerticesFromPlaneEquations(shiftedPlaneEquations,shiftedVertices);