godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Merge pull request #39730 from madmiraal/fix-39718

Browse Source 
Fix creation of duplicate faces in CSG merge faces.
This commit is contained in:
Rémi Verschelde
2020-06-21 17:55:58 +02:00
committed by GitHub
parent 277d2f1f50 f5b99b578e
commit fd21465ec3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/csg/csg.cpp
View File

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