diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-11 00:26:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 00:26:56 +0200 |
| commit | d0cea291d2b179610f20fb7136b3e74f26621e92 (patch) | |
| tree | 1d2b093f9d2ba8b7289dbcdff57c81bdbb89c603 /modules/bullet | |
| parent | 21e1ff4bb0bc982f97bf1d21637fe259badb2e22 (diff) | |
| parent | 7eebb06b5571437828d8c5099558c303c72cd1f4 (diff) | |
| download | redot-engine-d0cea291d2b179610f20fb7136b3e74f26621e92.tar.gz | |
Merge pull request #40193 from KoBeWi/dem_pikks
Allow Area2D and 3D mouse events without collision layer
Diffstat (limited to 'modules/bullet')
| -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 f82648d6ff..e1f950dad1 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 (needs) { + if (m_pickRay || needs) { btCollisionObject *btObj = static_cast<btCollisionObject *>(proxy0->m_clientObject); CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer()); |