Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #54528 from nekomatata/fix-crash-tileset-polygon

Fix crash in Tileset with get_collision_polygon_shape
Gilles Roudière 3 years ago
parent
af80bc8abe c29d3d0b17
commit
8f308bec25
1 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 2 2
      scene/resources/tile_set.cpp

+ 2 - 2
scene/resources/tile_set.cpp
View File 

@@ -4946,8 +4946,8 @@ int TileData::get_collision_polygon_shapes_count(int p_layer_id, int p_polygon_i
 
 Ref<ConvexPolygonShape2D> TileData::get_collision_polygon_shape(int p_layer_id, int p_polygon_index, int shape_index) const {
 
 	ERR_FAIL_INDEX_V(p_layer_id, physics.size(), 0);
 
 	ERR_FAIL_INDEX_V(p_polygon_index, physics[p_layer_id].polygons.size(), Ref<ConvexPolygonShape2D>());
 
-	ERR_FAIL_INDEX_V(shape_index, (int)physics[p_layer_id].polygons[shape_index].shapes.size(), Ref<ConvexPolygonShape2D>());
 
-	return physics[p_layer_id].polygons[shape_index].shapes[shape_index];
 
+	ERR_FAIL_INDEX_V(shape_index, (int)physics[p_layer_id].polygons[p_polygon_index].shapes.size(), Ref<ConvexPolygonShape2D>());
 
+	return physics[p_layer_id].polygons[p_polygon_index].shapes[shape_index];
 
 }
 
 
 // Terrain