summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2019-01-22 10:14:43 -0300
committerJuan Linietsky <reduzio@gmail.com>2019-01-22 10:15:18 -0300
commite081cec69f9719e0d481c077751ea7049b0eaacd (patch)
tree3f55ece4587e20f27db7d4dd0f62e9a4e3eba90d
parent46af4b0a4b73a14f01a1aba9b0a8ab0bef05252a (diff)
Fix collision margin being wrongly read by default, fixes #25181
-rw-r--r--scene/resources/tile_set.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp
index 38a5f9714e..5a2e7245a2 100644
--- a/scene/resources/tile_set.cpp
+++ b/scene/resources/tile_set.cpp
@@ -908,7 +908,7 @@ void TileSet::_tile_set_shapes(int p_id, const Array &p_shapes) {
if (d.has("one_way_margin") && d["one_way_margin"].is_num())
s.one_way_collision_margin = d["one_way_margin"];
else
- s.one_way_collision = 1.0;
+ s.one_way_collision_margin = 1.0;
if (d.has("autotile_coord") && d["autotile_coord"].get_type() == Variant::VECTOR2)
s.autotile_coord = d["autotile_coord"];