diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-20 09:06:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 09:06:29 +0200 |
| commit | 89f0d826ea7bc50122c15b8f59e5e1cda576c2c2 (patch) | |
| tree | e15aef15c1923915fd8f52550672b1027fd8018c | |
| parent | faa49c182978b3fe74e7aad65fb761c2881f009c (diff) | |
| parent | 7323f7998bf5025b182aa208b56cececdbfd0c2d (diff) | |
Merge pull request #21197 from JPTeasdale/input-picking-bug
Bullet ray picking should ignore objects with input_ray_pickable=false
| -rw-r--r-- | modules/bullet/godot_result_callbacks.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index 197550d686..815ad9c10f 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -51,8 +51,8 @@ bool GodotClosestRayResultCallback::needsCollision(btBroadphaseProxy *proxy0) co if (needs) { btCollisionObject *btObj = static_cast<btCollisionObject *>(proxy0->m_clientObject); CollisionObjectBullet *gObj = static_cast<CollisionObjectBullet *>(btObj->getUserPointer()); - if (m_pickRay && gObj->is_ray_pickable()) { - return true; + if (m_pickRay && !gObj->is_ray_pickable()) { + return false; } else if (m_exclude->has(gObj->get_self())) { return false; } |