Commit: ff7260551677ce449fbf08a963b17b7965ac4cc8
Author: Jeroen Bakker
Date: Tue Jul 5 09:17:27 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rBff7260551677ce449fbf08a963b17b7965ac4cc8
Remove early exit as with the new extraction method it would always fail.
===================================================================
M source/blender/blenkernel/BKE_uv_islands.hh
===================================================================
diff --git a/source/blender/blenkernel/BKE_uv_islands.hh
b/source/blender/blenkernel/BKE_uv_islands.hh
index 43802d03c56..c7cbcff8d8e 100644
--- a/source/blender/blenkernel/BKE_uv_islands.hh
+++ b/source/blender/blenkernel/BKE_uv_islands.hh
@@ -645,15 +645,11 @@ struct UVIsland {
*/
Vector<UVBorder> borders;
- /* UV bounds of this island to add early exits. */
- rctf uv_bounds;
-
UVIsland()
{
uv_vertices.reserve(100000);
uv_edges.reserve(100000);
uv_primitives.reserve(100000);
- BLI_rctf_init_minmax(&uv_bounds);
}
UVPrimitive *add_primitive(MeshPrimitive &primitive)
@@ -671,7 +667,6 @@ struct UVIsland {
uv_primitive_ptr->edges.append(uv_edge);
uv_edge->append_to_uv_vertices();
uv_edge->uv_primitives.append(uv_primitive_ptr);
- BLI_rctf_do_minmax_v(&uv_bounds, v1.uv);
}
return uv_primitive_ptr;
}
@@ -738,12 +733,6 @@ struct UVIsland {
bool has_shared_edge(const MeshPrimitive &primitive) const
{
- /* Early exit, uv bounds of the primitive should intersect with the uv
bounds of the island. */
- rctf prim_uv_bounds = primitive.uv_bounds();
- if (!BLI_rctf_isect(&uv_bounds, &prim_uv_bounds, nullptr)) {
- return false;
- }
-
for (const UVPrimitive &prim : uv_primitives) {
if (prim.has_shared_edge(primitive)) {
return true;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
