Browse Source

Merge pull request #55235 from Giwayume/bugfix/atlas_cutoff_edge_3.x

[3.x] Atlas import 1px missing from right side of non-cropped image.
Rémi Verschelde 3 years ago
parent
commit
00342b7d36
1 changed files with 1 additions and 1 deletions
  1. 1 1
      editor/import/resource_importer_texture_atlas.cpp

+ 1 - 1
editor/import/resource_importer_texture_atlas.cpp

@@ -131,7 +131,7 @@ static void _plot_triangle(Vector2 *vertices, const Vector2 &p_offset, bool p_tr
 	int max_y = MIN(y[2], height - p_offset.y - 1);
 	int max_y = MIN(y[2], height - p_offset.y - 1);
 	for (int yi = y[0]; yi < max_y; yi++) {
 	for (int yi = y[0]; yi < max_y; yi++) {
 		if (yi >= 0) {
 		if (yi >= 0) {
-			for (int xi = (xf > 0 ? int(xf) : 0); xi < (xt < src_width ? xt : src_width - 1); xi++) {
+			for (int xi = (xf > 0 ? int(xf) : 0); xi < (xt <= src_width ? xt : src_width); xi++) {
 				int px = xi, py = yi;
 				int px = xi, py = yi;
 				int sx = px, sy = py;
 				int sx = px, sy = py;
 				sx = CLAMP(sx, 0, src_width - 1);
 				sx = CLAMP(sx, 0, src_width - 1);