Merge branch 'Branch_2.86.1'

src/BulletCollision/CMakeLists.txt

@@ -190,15 +190,15 @@ SET(CollisionShapes_HDRS
 SET(Gimpact_HDRS
 	Gimpact/btBoxCollision.h
 	Gimpact/btClipPolygon.h
-	Gimpact/btContactProcessingSructs.h
+	Gimpact/btContactProcessingStructs.h
 	Gimpact/btContactProcessing.h
 	Gimpact/btGenericPoolAllocator.h
 	Gimpact/btGeometryOperations.h
-	Gimpact/btGImpactBvhSructs.h
+	Gimpact/btGImpactBvhStructs.h
 	Gimpact/btGImpactBvh.h
 	Gimpact/btGImpactCollisionAlgorithm.h
 	Gimpact/btGImpactMassUtil.h
-	Gimpact/btGImpactQuantizedBvhSructs.h
+	Gimpact/btGImpactQuantizedBvhStructs.h
 	Gimpact/btGImpactQuantizedBvh.h
 	Gimpact/btGImpactShape.h
 	Gimpact/btQuantization.h

src/BulletCollision/Gimpact/btContactProcessing.h

@@ -27,7 +27,7 @@ subject to the following restrictions:
 #include "LinearMath/btTransform.h"
 #include "LinearMath/btAlignedObjectArray.h"
 #include "btTriangleShapeEx.h"
-#include "btContactProcessingSructs.h"
+#include "btContactProcessingStructs.h"
 
 class btContactArray:public btAlignedObjectArray<GIM_CONTACT>
 {

src/BulletCollision/Gimpact/btGImpactBvh.h

@@ -29,7 +29,7 @@ subject to the following restrictions:
 
 #include "btBoxCollision.h"
 #include "btTriangleShapeEx.h"
-#include "btGImpactBvhSructs.h"
+#include "btGImpactBvhStructs.h"
 
 //! A pairset array
 class btPairSet: public btAlignedObjectArray<GIM_PAIR>

src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h

@@ -26,7 +26,7 @@ subject to the following restrictions:
 
 #include "btGImpactBvh.h"
 #include "btQuantization.h"
-#include "btGImpactQuantizedBvhSructs.h"
+#include "btGImpactQuantizedBvhStructs.h"
 
 class GIM_QUANTIZED_BVH_NODE_ARRAY:public btAlignedObjectArray<BT_QUANTIZED_BVH_NODE>
 {