[Bf-blender-cvs] [0e5a73fe8a3] temp-T97352-3d-texturing-seam-bleeding: Remove limit check in uv space.
Jeroen Bakker
noreply at git.blender.org
Mon May 2 14:33:58 CEST 2022
Commit: 0e5a73fe8a324f504cda70ebb1d8f6615a7b6b3a
Author: Jeroen Bakker
Date: Mon May 2 09:27:50 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding
https://developer.blender.org/rB0e5a73fe8a324f504cda70ebb1d8f6615a7b6b3a
Remove limit check in uv space.
===================================================================
M source/blender/blenkernel/intern/pbvh_pixels_seams.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh_pixels_seams.cc b/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
index 9aada456c77..77b1530d00f 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
@@ -46,10 +46,9 @@ bool share_uv(const MLoopUV *ldata_uv, EdgeLoop &edge1, EdgeLoop &edge2)
const float2 &uv_1_b = ldata_uv[edge1.l[1]].uv;
const float2 &uv_2_a = ldata_uv[edge2.l[0]].uv;
const float2 &uv_2_b = ldata_uv[edge2.l[1]].uv;
- const float limit = 0.0001f;
- return (compare_v2v2(uv_1_a, uv_2_a, limit) && compare_v2v2(uv_1_b, uv_2_b, limit)) ||
- (compare_v2v2(uv_1_a, uv_2_b, limit) && compare_v2v2(uv_1_b, uv_2_a, limit));
+ return (equals_v2v2(uv_1_a, uv_2_a) && equals_v2v2(uv_1_b, uv_2_b)) ||
+ (equals_v2v2(uv_1_a, uv_2_b) && equals_v2v2(uv_1_b, uv_2_a));
}
/** Make a list of connected and unconnected edgeloops that require UV Seam fixes. */
@@ -361,7 +360,8 @@ static void build_fixes(PBVH &pbvh,
* difference.
*/
float2 other_closest_point;
- interp_v2_v2v2(other_closest_point, luv_b_1.uv, luv_b_2.uv, lambda);
+ // How should we handle the winding order...
+ interp_v2_v2v2(other_closest_point, luv_b_2.uv, luv_b_1.uv, lambda);
/*
* Find the bitmap containing the information of the tile containing the
More information about the Bf-blender-cvs
mailing list