diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-05-14 14:50:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-14 14:50:17 +0200 |
commit | 15b25b739dab84dcde99deaf29e75547ec941f45 (patch) | |
tree | 90aa672d8623d299282bf6f2bbb7216f6738cdf3 /servers/physics_3d/space_3d_sw.cpp | |
parent | 5f5f53e8eba5c9b708714de58d3cca6ceb010279 (diff) | |
parent | a1aaed5a84e5206032495ee3d7447847aa8c9515 (diff) |
Merge pull request #38736 from akien-mga/modernize-all-the-things
C++: Apply some `modernize-*` checks from clang-tidy (nullptr, bool literals, void args)
Diffstat (limited to 'servers/physics_3d/space_3d_sw.cpp')
-rw-r--r-- | servers/physics_3d/space_3d_sw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_3d/space_3d_sw.cpp b/servers/physics_3d/space_3d_sw.cpp index 66d17b3182..6b31e0e094 100644 --- a/servers/physics_3d/space_3d_sw.cpp +++ b/servers/physics_3d/space_3d_sw.cpp @@ -331,7 +331,7 @@ bool PhysicsDirectSpaceState3DSW::cast_motion(const RID &p_shape, const Transfor bool PhysicsDirectSpaceState3DSW::collide_shape(RID p_shape, const Transform &p_shape_xform, real_t p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_collide_with_bodies, bool p_collide_with_areas) { if (p_result_max <= 0) - return 0; + return false; Shape3DSW *shape = static_cast<PhysicsServer3DSW *>(PhysicsServer3D::get_singleton())->shape_owner.getornull(p_shape); ERR_FAIL_COND_V(!shape, 0); |