diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-13 08:56:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-13 08:56:49 +0200 |
| commit | 3bf3a0abaabd2f7c9da78a0f847b4c9a5a6ad837 (patch) | |
| tree | ba3ea7b75eb6e14799191b9a0ce662eb96063891 | |
| parent | a9fe81efbd748a16a0c01d822d0b08eacea04880 (diff) | |
| parent | b27ec4aea736313f3931b7d8019132533febf4a7 (diff) | |
Merge pull request #32791 from groud/fix_sprite_frame_coords
Fixes Sprite's frame_coords
| -rw-r--r-- | scene/2d/sprite.cpp | 4 | ||||
| -rw-r--r-- | scene/3d/sprite_3d.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index 83f92ce2bc..d2e1e494e3 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -269,8 +269,8 @@ int Sprite::get_frame() const { } void Sprite::set_frame_coords(const Vector2 &p_coord) { - ERR_FAIL_INDEX(int(p_coord.x), vframes); - ERR_FAIL_INDEX(int(p_coord.y), hframes); + ERR_FAIL_INDEX(int(p_coord.x), hframes); + ERR_FAIL_INDEX(int(p_coord.y), vframes); set_frame(int(p_coord.y) * hframes + int(p_coord.x)); } diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index a9dacc442c..aec672d2c7 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -593,8 +593,8 @@ int Sprite3D::get_frame() const { } void Sprite3D::set_frame_coords(const Vector2 &p_coord) { - ERR_FAIL_INDEX(int(p_coord.x), vframes); - ERR_FAIL_INDEX(int(p_coord.y), hframes); + ERR_FAIL_INDEX(int(p_coord.x), hframes); + ERR_FAIL_INDEX(int(p_coord.y), vframes); set_frame(int(p_coord.y) * hframes + int(p_coord.x)); } |