From 01fbe80f8fb4dc5f2d4659f6553a4bd7c8cf2ed5 Mon Sep 17 00:00:00 2001
From: erwincoumans <erwincoumans@erwin-UBUNTU1210.(none)>
Date: Fri, 19 Jul 2013 07:10:38 -0700
Subject: [PATCH] use int instead of void to avoid 64bit error

---
 src/Bullet3OpenCL/RigidBody/b3GpuPgsJacobiSolver.cpp | 2 +-
 src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bullet3OpenCL/RigidBody/b3GpuPgsJacobiSolver.cpp b/src/Bullet3OpenCL/RigidBody/b3GpuPgsJacobiSolver.cpp
index 040c89130..c7026cfb8 100644
--- a/src/Bullet3OpenCL/RigidBody/b3GpuPgsJacobiSolver.cpp
+++ b/src/Bullet3OpenCL/RigidBody/b3GpuPgsJacobiSolver.cpp
@@ -1067,7 +1067,7 @@ b3Scalar b3GpuPgsJacobiSolver::solveGroupCacheFriendlyFinish(b3OpenCLArray<b3Rig
 					for (int i=0;i<numRows;i++)
 					{
 						int rowIndex =constraintRowOffset+i;
-						int orgConstraintIndex = (int)m_gpuData->m_cpuConstraintRows[rowIndex].m_originalContactPoint;
+						int orgConstraintIndex = m_gpuData->m_cpuConstraintRows[rowIndex].m_originalConstraintIndex;
 						float breakingThreshold = m_gpuData->m_cpuConstraints[orgConstraintIndex].m_breakingImpulseThreshold;
 					//	printf("rows[%d].m_appliedImpulse=%f\n",rowIndex,rows[rowIndex].m_appliedImpulse);
 						if (b3Fabs((m_gpuData->m_cpuConstraintRows[rowIndex].m_appliedImpulse) >= breakingThreshold))
diff --git a/src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h b/src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h
index 932688036..bf6309b61 100644
--- a/src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h
+++ b/src/Bullet3OpenCL/RigidBody/b3GpuSolverConstraint.h
@@ -56,6 +56,7 @@ B3_ATTRIBUTE_ALIGNED16 (struct)	b3GpuSolverConstraint
     union
 	{
 		void*		m_originalContactPoint;
+		int		m_originalConstraintIndex;
 		b3Scalar	m_unusedPadding4;
 	};