From 7eff49286c9fddb5904a24b8867bffdd1059ac51 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 18 Dec 2009 22:04:58 +0000 Subject: [PATCH] Avoid introducing virtual method to non-virtual classes, just for serialization Applied a LHS fix (although no real impact on performance on PS3), thanks to holorose see Issue 321 --- src/BulletCollision/CollisionDispatch/btUnionFind.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/BulletCollision/CollisionDispatch/btUnionFind.h b/src/BulletCollision/CollisionDispatch/btUnionFind.h index e105ecbff..f6bdc6df9 100644 --- a/src/BulletCollision/CollisionDispatch/btUnionFind.h +++ b/src/BulletCollision/CollisionDispatch/btUnionFind.h @@ -106,10 +106,12 @@ class btUnionFind //not really a reason not to use path compression, and it flattens the trees/improves find performance dramatically #ifdef USE_PATH_COMPRESSION - // - m_elements[x].m_id = m_elements[m_elements[x].m_id].m_id; - #endif // + const btElement* elementPtr = &m_elements[m_elements[x].m_id]; + m_elements[x].m_id = elementPtr->m_id; + x = elementPtr->m_id; + #else// x = m_elements[x].m_id; + #endif //btAssert(x < m_N); //btAssert(x >= 0);