Merge branch 'blender-v3.1-release'

This commit is contained in:
Brecht Van Lommel 2022-01-31 21:00:28 +01:00
commit c3a41a8002
1 changed files with 5 additions and 1 deletions

View File

@ -349,13 +349,17 @@ class TextureMarginMap {
* But it seems fast enough for now and that would add a lot of complexity. */
for (int i = 0; i < totloop; i++) {
int otherloop = loop_adjacency_map_[i + loopstart];
if (otherloop < 0) {
continue;
}
uint32_t poly = loop_to_poly_map_[otherloop];
if (lookup_pixel(x, y, poly, &destx, &desty, &foundpoly, &found_dist)) {
if (mindist < 0.f || found_dist < mindist) {
mindist = found_dist;
*r_other_poly = foundpoly;
;
*r_destx = destx;
*r_desty = desty;
*r_start_poly = poly;