diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-04 23:29:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 23:29:38 +0100 |
| commit | 0d1e3893d9f69c312aabc36e01ebd5c869ea30cf (patch) | |
| tree | 37a4fd8d204ca97b17634e31073f54057a90c4e7 /servers/physics_3d/godot_collision_object_3d.h | |
| parent | 71835906dd3965eac703137bc8e14abcaa630dfd (diff) | |
| parent | f8eaab5b4758dd2a1339e1b6abf5e9509ccba35c (diff) | |
Merge pull request #57630 from lawnjelly/bvh4_templated_checks
[4.x] BVH - Sync BVH with 3.x
Diffstat (limited to 'servers/physics_3d/godot_collision_object_3d.h')
| -rw-r--r-- | servers/physics_3d/godot_collision_object_3d.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_3d/godot_collision_object_3d.h b/servers/physics_3d/godot_collision_object_3d.h index 0178838a25..515b945564 100644 --- a/servers/physics_3d/godot_collision_object_3d.h +++ b/servers/physics_3d/godot_collision_object_3d.h @@ -169,7 +169,7 @@ public: return p_other->collision_layer & collision_mask; } - _FORCE_INLINE_ bool interacts_with(GodotCollisionObject3D *p_other) const { + _FORCE_INLINE_ bool interacts_with(const GodotCollisionObject3D *p_other) const { return collision_layer & p_other->collision_mask || p_other->collision_layer & collision_mask; } |