diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-04 16:36:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 16:36:16 +0200 |
| commit | 560510b93b0c4b4dc40ce0599695504c4b2155fb (patch) | |
| tree | 8e7458c325fa9f4fec14cc8c894f05211f552269 | |
| parent | 97c787b84df643821e6cad194f21d000532eed23 (diff) | |
| parent | 4af274756f0ed23091939a17f05d0cb1b7479a71 (diff) | |
Merge pull request #38446 from qarmin/navigation_polygon_type
Fixes type of array in _set_outlines function
| -rw-r--r-- | scene/2d/navigation_region_2d.cpp | 2 | ||||
| -rw-r--r-- | scene/2d/navigation_region_2d.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/navigation_region_2d.cpp b/scene/2d/navigation_region_2d.cpp index 19484442b1..abbfbf83b7 100644 --- a/scene/2d/navigation_region_2d.cpp +++ b/scene/2d/navigation_region_2d.cpp @@ -118,7 +118,7 @@ Array NavigationPolygon::_get_polygons() const { return ret; } -void NavigationPolygon::_set_outlines(const TypedArray<Vector<int32_t>> &p_array) { +void NavigationPolygon::_set_outlines(const TypedArray<Vector<Vector2>> &p_array) { outlines.resize(p_array.size()); for (int i = 0; i < p_array.size(); i++) { diff --git a/scene/2d/navigation_region_2d.h b/scene/2d/navigation_region_2d.h index cbfe4299fb..e730df6373 100644 --- a/scene/2d/navigation_region_2d.h +++ b/scene/2d/navigation_region_2d.h @@ -58,7 +58,7 @@ protected: void _set_polygons(const TypedArray<Vector<int32_t>> &p_array); Array _get_polygons() const; - void _set_outlines(const TypedArray<Vector<int32_t>> &p_array); + void _set_outlines(const TypedArray<Vector<Vector2>> &p_array); Array _get_outlines() const; public: |