Merge branch 'v0.8.0' into ifcmax/initial-refresh

This commit is contained in:
Josef Wienerroither
2026-02-15 07:47:47 +01:00
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -467,12 +467,12 @@ class DocPreferences(bpy.types.PropertyGroup):
classes_to_wireframe: StringProperty( classes_to_wireframe: StringProperty(
default="IfcVirtualElement", default="IfcVirtualElement",
name="Classes to Wireframe", name="Classes to Wireframe",
description="Upon import, these classes will display as wireframe.\nEx: IfcVirtualelement, IfcSpace", description="Upon import, these classes will display as wireframe.\nEx: IfcVirtualElement, IfcSpace",
) )
classes_no_cut: StringProperty( classes_no_cut: StringProperty(
default="IfcVirtualElement, IfcSpace", default="IfcVirtualElement, IfcSpace",
name="Classes that are not cut", name="Classes that are not cut",
description="The cut decoractor will be turned off for these classes\nEx: IfcVirtualelement, IfcSpace", description="The cut decorator will be turned off for these classes\nEx: IfcVirtualElement, IfcSpace",
) )
if TYPE_CHECKING: if TYPE_CHECKING:
+2 -2
View File
@@ -1239,6 +1239,7 @@ void fuse_corridor_halves_with_input(Arrangement_2& arr, Graph2D<K>& G, SegmentL
} }
class timer { class timer {
public:
class entry { class entry {
public: public:
entry(std::map<std::string, std::chrono::high_resolution_clock::time_point>::const_iterator start_it) entry(std::map<std::string, std::chrono::high_resolution_clock::time_point>::const_iterator start_it)
@@ -1253,9 +1254,8 @@ class timer {
std::map<std::string, std::chrono::high_resolution_clock::time_point>::const_iterator start_it; std::map<std::string, std::chrono::high_resolution_clock::time_point>::const_iterator start_it;
}; };
public:
entry start(const std::string& name) { entry start(const std::string& name) {
return timings_.insert({name, std::chrono::high_resolution_clock::now()}).first; return entry(timings_.insert({name, std::chrono::high_resolution_clock::now()}).first);
} }
private: private: