diff options
| author | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2019-06-01 16:42:22 +0300 |
|---|---|---|
| committer | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2019-06-27 18:29:35 +0300 |
| commit | 0c4c36d823bb6792917dfac86491f61cec3f9b27 (patch) | |
| tree | db6b87ccc416f6e9a23c69c0b625e7b4521d79f1 /scene/2d/physics_body_2d.cpp | |
| parent | 2df8b5606b9de9d11873c27f0a297127bbbfc255 (diff) | |
Add default values to the editor help, docs, and generated RST
Also, make spacing of "=" in the editor help a bit more consistent.
Closes #16086
Diffstat (limited to 'scene/2d/physics_body_2d.cpp')
| -rw-r--r-- | scene/2d/physics_body_2d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 2bd9e5e2a2..95acf13fad 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -1541,7 +1541,7 @@ Vector2 KinematicCollision2D::get_remainder() const { return collision.remainder; } Object *KinematicCollision2D::get_local_shape() const { - ERR_FAIL_COND_V(!owner, NULL); + if (!owner) return NULL; uint32_t ownerid = owner->shape_find_owner(collision.local_shape); return owner->shape_owner_get_owner(ownerid); } |