From ffa9015798a6940ac9d5fccb8d86c81311267221 Mon Sep 17 00:00:00 2001
From: Thomas Krijnen <t.krijnen@gmail.com>
Date: Tue, 11 Jul 2023 21:40:05 +0200
Subject: [PATCH] Lingering changes after conflict resolution

---
 src/ifcgeom/IfcGeomRepresentation.cpp | 2 +-
 src/ifcwrap/IfcGeomWrapper.i          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ifcgeom/IfcGeomRepresentation.cpp b/src/ifcgeom/IfcGeomRepresentation.cpp
index e878e9dfd5..d6380a5cdf 100644
--- a/src/ifcgeom/IfcGeomRepresentation.cpp
+++ b/src/ifcgeom/IfcGeomRepresentation.cpp
@@ -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_);
diff --git a/src/ifcwrap/IfcGeomWrapper.i b/src/ifcwrap/IfcGeomWrapper.i
index 592b2b1d23..5f1cc3aebd 100644
--- a/src/ifcwrap/IfcGeomWrapper.i
+++ b/src/ifcwrap/IfcGeomWrapper.i
@@ -288,7 +288,7 @@ struct ShapeRTTI : public boost::static_visitor<PyObject*>
 %}
 
 %extend IfcGeom::Representation::Triangulation {
-	%pythoncode %{
+    %pythoncode %{
         # Hide the getters with read-only property implementations
         id = property(id)
         faces = property(faces)
@@ -297,8 +297,8 @@ struct ShapeRTTI : public boost::static_visitor<PyObject*>
         materials = property(materials)
         verts = property(verts)
         normals = property(normals)
-		item_ids = property(item_ids)
-	%}
+        item_ids = property(item_ids)
+    %}
 };
 
 %extend IfcGeom::Representation::Serialization {