From f307f390239850acaacc8edba9436ba1e46ec86b Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Wed, 12 Dec 2018 16:29:10 +0100 Subject: [PATCH] Fix remaining merge conflict --- src/ifcgeom/IfcGeomRenderStyles.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ifcgeom/IfcGeomRenderStyles.cpp b/src/ifcgeom/IfcGeomRenderStyles.cpp index 4d912a83d2..edc2085b79 100644 --- a/src/ifcgeom/IfcGeomRenderStyles.cpp +++ b/src/ifcgeom/IfcGeomRenderStyles.cpp @@ -135,6 +135,6 @@ const IfcGeom::SurfaceStyle* IfcGeom::Kernel::get_style(const IfcSchema::IfcMate } } } - IfcGeom::SurfaceStyle material_style = IfcGeom::SurfaceStyle(material->id(), material->Name()); - return &(style_cache[material->id()] = material_style); + IfcGeom::SurfaceStyle material_style = IfcGeom::SurfaceStyle(material->data().id(), material->Name()); + return &(style_cache[material->data().id()] = material_style); }