Don't assign material as style when it doesn't have any styles #6314

aothms · aothms · commit b712f30ad38b · 2025-04-07T21:25:33.000+02:00
diff --git a/src/ifcgeom/Converter.cpp b/src/ifcgeom/Converter.cpp
@@ -126,11 +126,13 @@ IfcGeom::BRepElement* ifcopenshell::geometry::Converter::create_brep_for_represe
 	}
 
 	if (single_material) {
-		auto s = taxonomy::cast<taxonomy::style>(mapping_->map(single_material));
-		for (auto it = shapes.begin(); it != shapes.end(); ++it) {
-			if (!it->hasStyle() && s) {
-				it->setStyle(s);
-				material_style_applied = true;
+		if (auto itm = mapping_->map(single_material)) {
+			auto s = taxonomy::cast<taxonomy::style>(itm);
+			for (auto it = shapes.begin(); it != shapes.end(); ++it) {
+				if (!it->hasStyle() && s) {
+					it->setStyle(s);
+					material_style_applied = true;
+				}
 			}
 		}
 	} else {
diff --git a/src/ifcgeom/mapping/mapping.cpp b/src/ifcgeom/mapping/mapping.cpp
@@ -556,6 +556,10 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcMaterial* material) {
         }
     }
 
+    // When material does not have a representation we don't create a style from it
+    return nullptr;
+
+    /*
     taxonomy::style::ptr material_style = taxonomy::make<taxonomy::style>();
     material_style->instance = material;
     if (settings_.get<settings::UseMaterialNames>().get()) {
@@ -566,6 +570,7 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcMaterial* material) {
         material_style->name = oss.str();
     }
     return material_style;
+    */
 
     // @todo
     // IfcGeom::SurfaceStyle material_style = IfcGeom::SurfaceStyle(material->data().id(), material->Name());

Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,13 @@ IfcGeom::BRepElement* ifcopenshell::geometry::Converter::create_brep_for_represe`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`if (single_material) {`
`129`		`- auto s = taxonomy::cast<taxonomy::style>(mapping_->map(single_material));`
`130`		`- for (auto it = shapes.begin(); it != shapes.end(); ++it) {`
`131`		`- if (!it->hasStyle() && s) {`
`132`		`- it->setStyle(s);`
`133`		`- material_style_applied = true;`
	`129`	`+ if (auto itm = mapping_->map(single_material)) {`
	`130`	`+ auto s = taxonomy::cast<taxonomy::style>(itm);`
	`131`	`+ for (auto it = shapes.begin(); it != shapes.end(); ++it) {`
	`132`	`+ if (!it->hasStyle() && s) {`
	`133`	`+ it->setStyle(s);`
	`134`	`+ material_style_applied = true;`
	`135`	`+ }`
`134`	`136`	`}`
`135`	`137`	`}`
`136`	`138`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -556,6 +556,10 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcMaterial* material) {`
`556`	`556`	`}`
`557`	`557`	`}`
`558`	`558`
	`559`	`+ // When material does not have a representation we don't create a style from it`
	`560`	`+ return nullptr;`
	`561`	`+`
	`562`	`+ /*`
`559`	`563`	`taxonomy::style::ptr material_style = taxonomy::make<taxonomy::style>();`
`560`	`564`	`material_style->instance = material;`
`561`	`565`	`if (settings_.get<settings::UseMaterialNames>().get()) {`
`@@ -566,6 +570,7 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcMaterial* material) {`
`566`	`570`	`material_style->name = oss.str();`
`567`	`571`	`}`
`568`	`572`	`return material_style;`
	`573`	`+ */`
`569`	`574`
`570`	`575`	`// @todo`
`571`	`576`	`// IfcGeom::SurfaceStyle material_style = IfcGeom::SurfaceStyle(material->data().id(), material->Name());`