-Re-added margins in one way collision (made in a more user friendly way than in Godot 2.1), fixes #23860

-Fixed potential bug in OWC (i dont think anyone had it but..)

1 files changed, 4 insertions, 0 deletions

diff --git a/scene/2d/collision_shape_2d.h b/scene/2d/collision_shape_2d.h
index 8d74da0944..e913b4a866 100644
--- a/scene/2d/collision_shape_2d.h
+++ b/scene/2d/collision_shape_2d.h
@@ -46,6 +46,7 @@ class CollisionShape2D : public Node2D {
 	void _shape_changed();
 	bool disabled;
 	bool one_way_collision;
+	float one_way_collision_margin;
 
 	void _update_in_shape_owner(bool p_xform_only = false);
 
@@ -65,6 +66,9 @@ public:
 	void set_one_way_collision(bool p_enable);
 	bool is_one_way_collision_enabled() const;
 
+	void set_one_way_collision_margin(float p_margin);
+	float get_one_way_collision_margin() const;
+
 	virtual String get_configuration_warning() const;
 
 	CollisionShape2D();