diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-14 09:36:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-14 09:36:16 +0200 |
| commit | 59879447a395adc4ced2ee7e88b0ef1bcc32c82d (patch) | |
| tree | a17c5dc4fddebd4379d57c3de0ba88a01638b87d /servers/physics_2d/collision_solver_2d_sat.cpp | |
| parent | f32c042f3e14a2de2f2d416ff35b0a3c80785e33 (diff) | |
| parent | 8e3f71d75060c70745f541d5cab509f7bea690df (diff) | |
Merge pull request #51636 from Calinou/rename-lineshape2d
Rename LineShape2D to WorldMarginShape2D
Diffstat (limited to 'servers/physics_2d/collision_solver_2d_sat.cpp')
| -rw-r--r-- | servers/physics_2d/collision_solver_2d_sat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics_2d/collision_solver_2d_sat.cpp b/servers/physics_2d/collision_solver_2d_sat.cpp index 45b9e6414d..30a99d3d74 100644 --- a/servers/physics_2d/collision_solver_2d_sat.cpp +++ b/servers/physics_2d/collision_solver_2d_sat.cpp @@ -1114,12 +1114,12 @@ static void _collision_convex_polygon_convex_polygon(const Shape2DSW *p_a, const bool sat_2d_calculate_penetration(const Shape2DSW *p_shape_A, const Transform2D &p_transform_A, const Vector2 &p_motion_A, const Shape2DSW *p_shape_B, const Transform2D &p_transform_B, const Vector2 &p_motion_B, CollisionSolver2DSW::CallbackResult p_result_callback, void *p_userdata, bool p_swap, Vector2 *sep_axis, real_t p_margin_A, real_t p_margin_B) { PhysicsServer2D::ShapeType type_A = p_shape_A->get_type(); - ERR_FAIL_COND_V(type_A == PhysicsServer2D::SHAPE_LINE, false); + ERR_FAIL_COND_V(type_A == PhysicsServer2D::SHAPE_WORLD_MARGIN, false); ERR_FAIL_COND_V(p_shape_A->is_concave(), false); PhysicsServer2D::ShapeType type_B = p_shape_B->get_type(); - ERR_FAIL_COND_V(type_B == PhysicsServer2D::SHAPE_LINE, false); + ERR_FAIL_COND_V(type_B == PhysicsServer2D::SHAPE_WORLD_MARGIN, false); ERR_FAIL_COND_V(p_shape_B->is_concave(), false); static const CollisionFunc collision_table[5][5] = { |