diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-26 19:07:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 19:07:43 +0100 |
| commit | afa773f388fd2736546d9e998739b91949e9107e (patch) | |
| tree | c844eb901a6b31dc090ffd0956c6530e40f55444 | |
| parent | fc850b956b496b7bcbd09162973e03644b4e5f31 (diff) | |
| parent | 744c1fafff7fd63bfef4f26ae03711104690f3e8 (diff) | |
Merge pull request #36564 from dankan1890/quick_fix
Fixed TextureAtlas import size.
| -rw-r--r-- | editor/import/resource_importer_texture_atlas.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/import/resource_importer_texture_atlas.cpp b/editor/import/resource_importer_texture_atlas.cpp index 4291d6f2d7..3172cc7279 100644 --- a/editor/import/resource_importer_texture_atlas.cpp +++ b/editor/import/resource_importer_texture_atlas.cpp @@ -143,8 +143,8 @@ static void _plot_triangle(Vector2 *vertices, const Vector2 &p_offset, bool p_tr int px = xi, py = yi; int sx = px, sy = py; - sx = CLAMP(sx, 0, src_width); - sy = CLAMP(sy, 0, src_height); + sx = CLAMP(sx, 0, src_width - 1); + sy = CLAMP(sy, 0, src_height - 1); Color color = p_src_image->get_pixel(sx, sy); if (p_transposed) { SWAP(px, py); @@ -165,8 +165,8 @@ static void _plot_triangle(Vector2 *vertices, const Vector2 &p_offset, bool p_tr for (int xi = (xf < width ? int(xf) : width - 1); xi >= (xt > 0 ? xt : 0); xi--) { int px = xi, py = yi; int sx = px, sy = py; - sx = CLAMP(sx, 0, src_width); - sy = CLAMP(sy, 0, src_height); + sx = CLAMP(sx, 0, src_width - 1); + sy = CLAMP(sy, 0, src_height - 1); Color color = p_src_image->get_pixel(sx, sy); if (p_transposed) { SWAP(px, py); |