Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-17 10:59:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lingering changes after conflict resolution

Browse Source
This commit is contained in:
Thomas Krijnen
2023-07-11 21:40:05 +02:00
parent 8e4b93fb03
commit ffa9015798
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomRepresentation.cpp
+1 -1
View File
@@ -397,7 +397,7 @@ int IfcGeom::Representation::Triangulation::addVertex(int item_id, int material_
const double Z = convert ? (pZ /unit_magnitude) : pZ;
int i = (int)_verts.size() / 3;
if (settings().get<ifcopenshell::geometry::settings::WeldVertices>().get()) {
const VertexKey key = std::make_tuple(item_index, material_index, X, Y, Z);
const VertexKey key = std::make_tuple(item_id, material_index, X, Y, Z);
typename VertexKeyMap::const_iterator it = welds.find(key);
if (it != welds.end()) return it->second;
i = (int)(welds.size() + weld_offset_);