Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #444 from AndrewMeadows/btCompoundShape-with-protected-data-memebers

Browse Source 
Make btCompoundShape data members protected instead of private
This commit is contained in:
erwincoumans
2015-08-03 17:00:23 -07:00
parent 9d7d5caa8b ac7dc87a4d
commit 5e956154ce
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletCollision/CollisionShapes/btCompoundShape.h
View File

@@ -53,6 +53,7 @@ SIMD_FORCE_INLINE bool operator==(const btCompoundShapeChild& c1, const btCompou
/// Currently, removal of child shapes is only supported when disabling the aabb tree (pass 'false' in the constructor of btCompoundShape)
ATTRIBUTE_ALIGNED16(class) btCompoundShape : public btCollisionShape
{
protected:
btAlignedObjectArray<btCompoundShapeChild> m_children;
btVector3 m_localAabbMin;
btVector3 m_localAabbMax;
@@ -64,7 +65,6 @@ ATTRIBUTE_ALIGNED16(class) btCompoundShape : public btCollisionShape
btScalar m_collisionMargin;
protected:
btVector3 m_localScaling;
public: