Explorar o código

Merge pull request #39729 from madmiraal/fix-39718-3.2

[3.2] Fix creation of duplicate faces in CSG merge faces.
Rémi Verschelde %!s(int64=5) %!d(string=hai) anos
pai
achega
6cf8709808
Modificáronse 1 ficheiros con 4 adicións e 2 borrados
  1. 4 2
      modules/csg/csg.cpp

+ 4 - 2
modules/csg/csg.cpp

@@ -905,8 +905,10 @@ void CSGBrushOperation::Build2DFaces::_merge_faces(const Vector<int> &p_segment_
 				vertices[p_segment_indices[closest_idx]].point
 			};
 			if (are_segements_parallel(edge1, edge2, vertex_snap2)) {
-				degenerate_points.push_back(outer_edge_idx[0]);
-				degenerate_points.push_back(outer_edge_idx[1]);
+				if (!degenerate_points.find(outer_edge_idx[0]))
+					degenerate_points.push_back(outer_edge_idx[0]);
+				if (!degenerate_points.find(outer_edge_idx[1]))
+					degenerate_points.push_back(outer_edge_idx[1]);
 				continue;
 			}