From 1b134d60d5f970494d6d88fb57a015510485d197 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Mon, 25 May 2015 15:46:55 -0700 Subject: [PATCH] Fix typo that messed up the otherEntity for collisions. --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index c5e0e0ccaa..a96c1014a2 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -1198,7 +1198,7 @@ void EntityTreeRenderer::entityCollisionWithEntity(const EntityItemID& idA, cons entityScriptA.property("collisionWithEntity").call(entityScriptA, args); } - emit collisionWithEntity(idB, idB, collision); + emit collisionWithEntity(idB, idA, collision); QScriptValue entityScriptB = loadEntityScript(idB); if (entityScriptB.property("collisionWithEntity").isValid()) { QScriptValueList args;