minor issues, don't inline a out-of-line method, reorder members

src/BulletCollision/CollisionDispatch/btCollisionObject.h

@@ -185,7 +185,7 @@ public:
 
 	SIMD_FORCE_INLINE	int	getActivationState() const { return m_activationState1;}
 	
-	SIMD_FORCE_INLINE	void setActivationState(int newState);
+	void setActivationState(int newState);
 
 	void	setDeactivationTime(btScalar time)
 	{

src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h

@@ -52,10 +52,10 @@ ATTRIBUTE_ALIGNED16( class) btPersistentManifold
 	/// void* will allow any rigidbody class
 	void* m_body0;
 	void* m_body1;
-	btScalar	m_contactBreakingThreshold;
-
 	int	m_cachedPoints;
 
+	btScalar	m_contactBreakingThreshold;
+
 	
 	/// sort cached points so most isolated points come first
 	int	sortCachedPoints(const btManifoldPoint& pt);