diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-27 23:00:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 23:00:54 +0200 |
| commit | f93c04d8efef1bdfff5d5839569eb7e22c667be6 (patch) | |
| tree | d09d23df65989fe66dd51d8ce62be88ec3d5515a /modules/bullet/godot_result_callbacks.cpp | |
| parent | 04f46aea8d73d45673d2b29e98d7c8bf7945bee0 (diff) | |
| parent | c845e20addb28ea250b705a4eeb4418fa8bbb85c (diff) | |
Merge pull request #40776 from akien-mga/revert-40193
Revert "Allow Area2D and 3D mouse events without a collision layer"
Diffstat (limited to 'modules/bullet/godot_result_callbacks.cpp')
| -rw-r--r-- | modules/bullet/godot_result_callbacks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index e1f950dad1..f82648d6ff 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -57,7 +57,7 @@ bool GodotFilterCallback::needBroadphaseCollision(btBroadphaseProxy *proxy0, btB bool GodotClosestRayResultCallback::needsCollision(btBroadphaseProxy *proxy0) const { const bool needs = GodotFilterCallback::test_collision_filters(m_collisionFilterGroup, m_collisionFilterMask, proxy0->m_collisionFilterGroup, proxy0->m_collisionFilterMask); - if (m_pickRay || needs) { + if (needs) { btCollisionObject *btObj = static_cast<btCollisionObject *>(proxy0->m_clientObject); CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer()); |