godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36564 from dankan1890/quick_fix 

Fixed TextureAtlas import size.
This commit is contained in:
Rémi Verschelde 2020-02-26 19:07:43 +01:00 committed by GitHub
parent fc850b956b 744c1fafff
commit afa773f388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/import/resource_importer_texture_atlas.cpp
View File

@ -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);