Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-26 18:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining merge conflict

Browse Source
This commit is contained in:
Thomas Krijnen
2018-12-12 16:29:10 +01:00
parent f526277a7d
commit f307f39023
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomRenderStyles.cpp
+2 -2
View File
@@ -135,6 +135,6 @@ const IfcGeom::SurfaceStyle* IfcGeom::Kernel::get_style(const IfcSchema::IfcMate
} }
} }
} }
IfcGeom::SurfaceStyle material_style = IfcGeom::SurfaceStyle(material->id(), material->Name()); IfcGeom::SurfaceStyle material_style = IfcGeom::SurfaceStyle(material->data().id(), material->Name());
return &(style_cache[material->id()] = material_style); return &(style_cache[material->data().id()] = material_style);
} }