From 9817fa4ef60877d68a9e88c174fb791d1e130eaa Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Thu, 26 Jan 2012 15:39:07 +0000 Subject: [PATCH] - fix GhostObject overlapping objects in native bullet (thanks to @ttrocha) (Fixes issue 457) git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9113 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../com_jme3_bullet_objects_PhysicsGhostObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/src/bullet-native/com_jme3_bullet_objects_PhysicsGhostObject.cpp b/engine/src/bullet-native/com_jme3_bullet_objects_PhysicsGhostObject.cpp index 092805d76..2fb48f54b 100644 --- a/engine/src/bullet-native/com_jme3_bullet_objects_PhysicsGhostObject.cpp +++ b/engine/src/bullet-native/com_jme3_bullet_objects_PhysicsGhostObject.cpp @@ -181,7 +181,7 @@ extern "C" { virtual ~jmeGhostOverlapCallback() {} virtual bool processOverlap(btBroadphasePair& pair) { - btCollisionObject *co1 = (btCollisionObject *)pair.m_pProxy0->m_clientObject; + btCollisionObject *co1 = (btCollisionObject *)pair.m_pProxy1->m_clientObject; jmeUserPointer *up1 = (jmeUserPointer*)co1 -> getUserPointer(); jobject javaCollisionObject1 = m_env->NewLocalRef(up1->javaCollisionObject); m_env->CallVoidMethod(m_object, jmeClasses::PhysicsGhostObject_addOverlappingObject, javaCollisionObject1);