blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: Fix off-by-half-errors with udim search

This commit is contained in:
Chris Blackbourn 2022-07-24 14:48:30 +12:00
parent f1f2c26223
commit 0fcc04e7bf
Notes: blender-bot 2023-02-14 05:16:25 +01:00 
Referenced by commit 68c1eb86a6, Fix unreported: Add tie-break conditions for udim search with integers
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/image.cc
View File

@ -867,28 +867,28 @@ int BKE_image_find_nearest_tile_with_offset(const Image *image,
const float co[2],
float r_uv_offset[2])
{
const float co_floor[2] = {floorf(co[0]), floorf(co[1])};
/* Distance to the closest UDIM tile. */
/* Distance squared to the closest UDIM tile. */
float dist_best_sq = FLT_MAX;
float uv_offset_best[2] = {0, 0};
int tile_number_best = -1;
const float co_offset[2] = {co[0] - 0.5f, co[1] - 0.5f};
LISTBASE_FOREACH (const ImageTile *, tile, &image->tiles) {
float uv_offset[2];
BKE_image_get_tile_uv(image, tile->tile_number, uv_offset);
if (equals_v2v2(co_floor, uv_offset)) {
copy_v2_v2(r_uv_offset, uv_offset);
return tile->tile_number;
}
/* Distance between co[2] and UDIM tile. */
const float dist_sq = len_squared_v2v2(uv_offset, co);
/* Distance squared between co[2] and center of UDIM tile. */
const float dist_sq = len_squared_v2v2(uv_offset, co_offset);
if (dist_sq < dist_best_sq) {
dist_best_sq = dist_sq;
tile_number_best = tile->tile_number;
copy_v2_v2(uv_offset_best, uv_offset);
if (dist_best_sq < 0.5f * 0.5f) {
break; /* No other tile can be closer. */
}
}
}
if (tile_number_best != -1) {