Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 06:39:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

check for get_surface_style returning nullptr

Browse Source
This commit is contained in:
Thomas Krijnen
2020-08-06 15:29:28 +02:00
parent 2cf06c0d6a
commit 891732d22f
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/schema/mapping.cpp
+12 -6
View File
@@ -972,7 +972,10 @@ taxonomy::item* mapping::map_impl(const IfcSchema::IfcMaterial* material) {
styles->push((**it).Items()->as<IfcSchema::IfcStyledItem>()); styles->push((**it).Items()->as<IfcSchema::IfcStyledItem>());
} }
if (styles->size() == 1) { if (styles->size() == 1) {
return map(*styles->begin()); auto s = map(*styles->begin());
if (s) {
return s;
}
} }
} }
@@ -985,15 +988,18 @@ taxonomy::item* mapping::map_impl(const IfcSchema::IfcMaterial* material) {
} }
taxonomy::item* mapping::map_impl(const IfcSchema::IfcStyledItem* inst) { taxonomy::item* mapping::map_impl(const IfcSchema::IfcStyledItem* inst) {
auto style_pair = get_surface_style<IfcSchema::IfcSurfaceStyleShading>(inst);
IfcSchema::IfcSurfaceStyle* style = style_pair.first;
IfcSchema::IfcSurfaceStyleShading* shading = style_pair.second;
if (style == nullptr) {
return nullptr;
}
static taxonomy::colour white = taxonomy::colour(1., 1., 1.); static taxonomy::colour white = taxonomy::colour(1., 1., 1.);
taxonomy::style* surface_style = new taxonomy::style; taxonomy::style* surface_style = new taxonomy::style;
auto style_pair = get_surface_style<IfcSchema::IfcSurfaceStyleShading>(inst);
IfcSchema::IfcSurfaceStyle* style = style_pair.first;
IfcSchema::IfcSurfaceStyleShading* shading = style_pair.second;
surface_style->instance = style; surface_style->instance = style;
if (style->hasName()) { if (style->hasName()) {
surface_style->name = style->Name(); surface_style->name = style->Name();