Proceed with merge

src/serializers/WavefrontObjSerializer.h

@@ -25,7 +25,7 @@
 #include <fstream>
 
 #include "../serializers/serializers_api.h"
-#include "../ifcgeom_schema_agnostic/GeometrySerializer.h"
+#include "../ifcgeom/GeometrySerializer.h"
 
 // http://people.sc.fsu.edu/~jburkardt/txt/obj_format.txt
 class SERIALIZERS_API WaveFrontOBJSerializer : public WriteOnlyGeometrySerializer {
@@ -39,7 +39,7 @@ public:
 	virtual ~WaveFrontOBJSerializer() {}
 	bool ready();
 	void writeHeader();
-	void writeMaterial(const IfcGeom::Material& style);
+	void writeMaterial(const ifcopenshell::geometry::taxonomy::style& style);
 	void write(const IfcGeom::TriangulationElement* o);
 	void write(const IfcGeom::BRepElement* /*o*/) {}
 	void finalize() {}