Add tests for IfcGridAxis fixes

- Add test_create_axis_curve.py with three unit tests: basic
  polyline creation, safe removal of an unshared existing curve,
  and preservation of a shared curve when only one referencing
  axis is updated (regression for the shallow-copy duplication bug)
- Add feature scenario "Export IFC - with duplicate-of-duplicate
  grid axis locations preserved" to project.feature, reproducing
  the case where duplicates of duplicates lost their positions on
  save/reload

.gitignore

@@ -127,7 +127,6 @@ src/ifcopenshell-python/ifcopenshell/express/*.exp.cache.dat
 
 # temp files from AI coding tools
 *.claude
-CLAUDE.local.md
 *.py.tmp*
 *.json.tmp*
 

cmake/CMakeLists.txt

@@ -314,12 +314,8 @@ if(WASM_BUILD)
 else()
     # @todo review this, shouldn't this be all possible header-only now?
     # ... or rewritten using C++17 features?
-    # Boost.System has been header-only since 1.69 and its compiled stub library
-    # was dropped in newer Boost, so requesting it as a component makes
-    # find_package fail on Boost 1.70 and up (for example Boost 1.90). It is
-    # still pulled in transitively by thread / iostreams where needed, so do not
-    # request it explicitly.
     set(BOOST_COMPONENTS
+        system
         program_options
         regex
         thread

src/bonsai/bonsai/bim/export_ifc.py

@@ -120,10 +120,10 @@ class IfcExporter:
                 # updata_representation will run edit_object_placement if object is scaled
                 # and had no openings.
                 return element
-        if not tool.Ifc.is_moved(obj):
-            return
         if element.is_a("IfcGridAxis"):
             return self.sync_grid_axis_object_placement(obj, element)
+        if not tool.Ifc.is_moved(obj):
+            return
         if not hasattr(element, "ObjectPlacement"):
             return
         bonsai.core.geometry.edit_object_placement(tool.Ifc, tool.Geometry, tool.Surveyor, obj=obj)
@@ -134,7 +134,8 @@ class IfcExporter:
         grid_obj = tool.Ifc.get_object(grid)
         if grid_obj:
             self.sync_object_placement(grid_obj)
-            if grid_obj.matrix_world != obj.matrix_world:
+            matrices_differ = grid_obj.matrix_world != obj.matrix_world
+            if matrices_differ:
                 bpy.ops.bim.update_representation(obj=obj.name)
         tool.Geometry.record_object_position(obj)
 

src/bonsai/bonsai/bim/handler.py

@@ -320,11 +320,9 @@ def loadIfcStore(scene: bpy.types.Scene) -> None:
     IfcStore.purge()
     refresh_ui_data()
     if not tool.Ifc.get():
-        tool.Autosave.cancel_timer()
         return
     tool.Ifc.schema()
     IfcStore.relink_all_objects()
-    tool.Autosave.reset_timer()
 
 
 @persistent

src/bonsai/bonsai/bim/module/project/__init__.py

@@ -18,8 +18,6 @@
 
 import bpy
 
-import bonsai.tool as tool
-
 from . import decorator, gizmo, operator, prop, ui, workspace
 
 classes = (
@@ -60,8 +58,6 @@ classes = (
     operator.LinkIfc,
     operator.LoadBlendMetadataAndIFC,
     operator.LoadLink,
-    operator.AutosavePrompt,
-    operator.LoadAutosavedRecoveryPopup,
     operator.LoadLinkedProject,
     operator.LoadProject,
     operator.LoadProjectElements,
@@ -140,7 +136,6 @@ def register():
 def unregister():
     if not bpy.app.background:
         bpy.utils.unregister_tool(workspace.ExploreTool)
-    tool.Autosave.cancel_timer()
     del bpy.types.Scene.BIMProjectProperties
     del bpy.types.Scene.MeasureToolSettings
     bpy.app.handlers.load_post.remove(decorator.toggle_decorations_on_load)

src/bonsai/bonsai/bim/module/project/operator.py

@@ -985,10 +985,8 @@ class LoadProject(bpy.types.Operator, IFCFileSelector, ImportHelper):
         ),
         default=False,
     )
-    skip_autosave_recovery: bpy.props.BoolProperty(default=False, options={"HIDDEN", "SKIP_SAVE"})
     use_detailed_tooltip: bpy.props.BoolProperty(default=False, options={"HIDDEN"})
     filename_ext = ".ifc"
-    skip_recent: bpy.props.BoolProperty(default=False, options={"HIDDEN", "SKIP_SAVE"})
 
     if TYPE_CHECKING:
         filepath: str
@@ -997,7 +995,6 @@ class LoadProject(bpy.types.Operator, IFCFileSelector, ImportHelper):
         use_relative_path: bool
         should_start_fresh_session: bool
         import_without_ifc_data: bool
-        skip_autosave_recovery: bool
         use_detailed_tooltip: bool
 
     @classmethod
@@ -1044,26 +1041,7 @@ class LoadProject(bpy.types.Operator, IFCFileSelector, ImportHelper):
 
         return tooltip
 
-    def check_autosave_recovery(self, context: bpy.types.Context) -> set["rna_enums.OperatorReturnItems"] | None:
-        if self.skip_autosave_recovery:
-            return None
-        autosaved_filepath = tool.Autosave.get_newer_autosaved_path(self.get_filepath_abs())
-        if not autosaved_filepath:
-            return None
-        return bpy.ops.bim.load_autosaved_recovery_popup(
-            "INVOKE_DEFAULT",
-            original_filepath=str(self.get_filepath_abs()),
-            autosaved_filepath=autosaved_filepath,
-            is_advanced=self.is_advanced,
-            use_relative_path=self.use_relative_path,
-            should_start_fresh_session=self.should_start_fresh_session,
-            import_without_ifc_data=self.import_without_ifc_data,
-        )
-
     def execute(self, context):
-        if recovery := self.check_autosave_recovery(context):
-            return recovery
-
         if (
             tool.Blender.get_addon_preferences().save_metadata_blend_file
             and self.should_start_fresh_session
@@ -1158,8 +1136,7 @@ class LoadProject(bpy.types.Operator, IFCFileSelector, ImportHelper):
             props.should_save_metadata_for_this_file = metadata_doc is not None
 
             tool.Blender.register_toolbar()
-            if not self.skip_recent:
-                tool.Project.add_recent_ifc_project(self.get_filepath_abs())
+            tool.Project.add_recent_ifc_project(self.get_filepath_abs())
 
             if self.is_advanced:
                 pass
@@ -1172,13 +1149,10 @@ class LoadProject(bpy.types.Operator, IFCFileSelector, ImportHelper):
         except:
             bonsai.last_error = traceback.format_exc()
             raise
-        tool.Autosave.reset_timer()
         return {"FINISHED"}
 
     def invoke(self, context, event):
         if self.filepath:
-            if recovery := self.check_autosave_recovery(context):
-                return recovery
             return self.execute(context)
         return ImportHelper.invoke(self, context, event)
 
@@ -1973,7 +1947,6 @@ class ExportIFC(bpy.types.Operator, ExportHelper):
     json_compact: bpy.props.BoolProperty(name="Export Compact IFCJSON", default=False)
     should_save_as: bpy.props.BoolProperty(name="Should Save As", default=False, options={"HIDDEN"})
     use_relative_path: bpy.props.BoolProperty(name="Use Relative Path", default=False)
-    skip_recent: bpy.props.BoolProperty(default=False, options={"HIDDEN", "SKIP_SAVE"})
 
     if TYPE_CHECKING:
         filter_glob: str
@@ -2034,18 +2007,6 @@ class ExportIFC(bpy.types.Operator, ExportHelper):
         return {"FINISHED"}
 
     def _execute(self, context):
-        project_props = tool.Project.get_project_props()
-        project_props.use_relative_project_path = self.use_relative_path
-
-        # Fallback if filepath is not set
-        if not getattr(self, "filepath", None) or self.filepath.strip() in ("", ".ifc"):
-            props = tool.Blender.get_bim_props()
-            if props.ifc_file:
-                self.filepath = str(tool.Blender.ensure_blender_path_is_abs(Path(props.ifc_file)))
-            else:
-                self.report({"ERROR"}, "No filepath available for saving.")
-                return {"CANCELLED"}
-
         committed, failed_commits = tool.Parametric.commit_pending_edits()
         # Previews are session-transient — discard rather than commit. Sibling
         # gizmo polls gate on each preview's is_active flag, and a stuck flag
@@ -2108,8 +2069,7 @@ class ExportIFC(bpy.types.Operator, ExportHelper):
         settings.logger.info("Export finished in {:.2f} seconds".format(time.time() - start))
         print("Export finished in {:.2f} seconds".format(time.time() - start))
         # New project created in Bonsai should be in recent projects too.
-        if not self.skip_recent:
-            tool.Project.add_recent_ifc_project(Path(output_file))
+        tool.Project.add_recent_ifc_project(Path(output_file))
         props = tool.Project.get_project_props()
         if props.use_relative_project_path and bpy.data.is_saved:
             output_file = os.path.relpath(output_file, bpy.path.abspath("//"))
@@ -2143,7 +2103,6 @@ class ExportIFC(bpy.types.Operator, ExportHelper):
             )
 
         bonsai.bim.handler.refresh_ui_data()
-        tool.Autosave.reset_timer()
 
     @classmethod
     def description(cls, context, properties):
@@ -2152,97 +2111,6 @@ class ExportIFC(bpy.types.Operator, ExportHelper):
         return "Save the IFC file.  Will save both .IFC/.BLEND files if synced together"
 
 
-class LoadAutosavedRecoveryPopup(bpy.types.Operator):
-    bl_idname = "bim.load_autosaved_recovery_popup"
-    bl_label = "Recover Autosaved File"
-    bl_options = {"REGISTER", "UNDO"}
-
-    original_filepath: bpy.props.StringProperty(options={"SKIP_SAVE"})
-    autosaved_filepath: bpy.props.StringProperty(options={"SKIP_SAVE"})
-    is_advanced: bpy.props.BoolProperty(default=False, options={"SKIP_SAVE"})
-    use_relative_path: bpy.props.BoolProperty(default=False, options={"SKIP_SAVE"})
-    should_start_fresh_session: bpy.props.BoolProperty(default=True, options={"SKIP_SAVE"})
-    import_without_ifc_data: bpy.props.BoolProperty(default=False, options={"SKIP_SAVE"})
-
-    def draw(self, context):
-        layout = self.layout
-        layout.label(text="A newer autosaved copy was found:", icon="INFO")
-        layout.label(text=os.path.basename(self.autosaved_filepath))
-        layout.separator()
-        layout.label(text="Do you want to load the autosaved version instead?")
-        layout.label(text="(Cancel will load the original)")
-
-    def invoke(self, context, event):
-        # invoke_props_dialog is modal - unlike invoke_popup/popup_menu, it
-        # isn't dismissed by the mouse simply leaving its bounds. It always
-        # renders both a fixed "Cancel" button and this confirm_text one, so
-        # the question is framed as Yes/Cancel rather than adding separate
-        # Load buttons on top.
-        return context.window_manager.invoke_props_dialog(
-            self, width=420, title="Recover Autosaved File", confirm_text="Yes"
-        )
-
-    def _load(self, filepath: str, skip_recent: bool) -> set["rna_enums.OperatorReturnItems"]:
-        return bpy.ops.bim.load_project(
-            filepath=filepath,
-            skip_autosave_recovery=True,  # Prevent infinite loop
-            is_advanced=self.is_advanced,
-            use_relative_path=self.use_relative_path,
-            should_start_fresh_session=self.should_start_fresh_session,
-            import_without_ifc_data=self.import_without_ifc_data,
-            skip_recent=skip_recent,
-        )
-
-    def execute(self, context):
-        result = self._load(self.autosaved_filepath, skip_recent=True)
-        # Re-point tracking at the original path so future saves write back
-        # to it, not "_autosaved.ifc".
-        tool.Ifc.set_path(self.original_filepath)
-        return result
-
-    def cancel(self, context):
-        # Also reached via Escape or a click outside the dialog, not just Cancel.
-        self._load(self.original_filepath, skip_recent=False)
-
-
-class AutosavePrompt(bpy.types.Operator):
-    bl_idname = "bim.autosave_prompt"
-    bl_label = "Autosave Reminder"
-    bl_options = set()
-
-    def invoke(self, context, event):
-        return context.window_manager.invoke_props_dialog(
-            self, width=400, confirm_text="Save", title="Autosave Reminder"
-        )
-
-    def draw(self, context):
-        layout = self.layout
-        layout.label(text="The autosave timer has expired.", icon="INFO")
-        layout.label(text="Would you like to save your IFC project now?")
-
-    def execute(self, context):
-        # Get current IFC path
-        props = tool.Blender.get_bim_props()
-        current_ifc_path = props.ifc_file
-
-        if not current_ifc_path:
-            self.report({"WARNING"}, "No IFC file path set. Please save manually.")
-            tool.Autosave.reset_timer()
-            return {"CANCELLED"}
-
-        # Call save_project with explicit filepath using EXEC_DEFAULT
-        result = bpy.ops.bim.save_project(
-            "EXEC_DEFAULT", filepath=current_ifc_path, should_save_as=False, skip_recent=True
-        )
-
-        tool.Autosave.reset_timer()
-        return result
-
-    def cancel(self, context):
-        tool.Autosave.reset_timer()
-        return {"CANCELLED"}
-
-
 class LoadLinkedProject(bpy.types.Operator, ImportHelper):
     bl_idname = "bim.load_linked_project"
     bl_label = "Load Project For Viewing Only"

src/bonsai/bonsai/bim/module/spatial/prop.py

@@ -128,7 +128,7 @@ def update_grid_is_locked(self: "BIMGridProperties", context: bpy.types.Context)
     if tool.Ifc.get().schema in ("IFC2X3", "IFC4"):
         elements = tool.Ifc.get().by_type("IfcGrid") + tool.Ifc.get().by_type("IfcGridAxis")
     else:
-        elements = tool.Ifc.get().by_type("IfcPositioningElement")
+        elements = tool.Ifc.get().by_type("IfcPositioningElement") + tool.Ifc.get().by_type("IfcGridAxis")
     for element in elements:
         if obj := tool.Ifc.get_object(element):
             if self.is_locked:

src/bonsai/bonsai/bim/ui.py

@@ -577,43 +577,6 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences):
     should_disable_undo_on_save: BoolProperty(
         name="Disable Undo When Saving (Faster saves, no undo for you!)", default=False
     )
-
-    def update_autosave_settings(self, context: bpy.types.Context) -> None:
-        if self.autosave_enabled:
-            tool.Autosave.reset_timer()
-        else:
-            tool.Autosave.cancel_timer()
-
-    autosave_enabled: BoolProperty(
-        name="Enable IFC Autosave Timer",
-        description="Periodically remind you to save or automatically create a backup copy of the IFC file",
-        default=False,
-        update=update_autosave_settings,
-    )
-    autosave_interval_minutes: bpy.props.IntProperty(
-        name="Autosave Interval (Minutes)",
-        description="Time between autosave reminders or backups. The timer resets whenever you open or save a project",
-        default=10,
-        min=1,
-        max=1440,
-        update=update_autosave_settings,
-    )
-    autosave_mode: bpy.props.EnumProperty(
-        name="Autosave Mode",
-        items=[
-            (
-                "PROMPT",
-                "Prompt to Save",
-                "Show a dialog offering to save the IFC project when the timer expires",
-            ),
-            (
-                "BACKUP",
-                "Automatic Backup",
-                "Save a backup copy as filename_autosaved.ifc when the timer expires",
-            ),
-        ],
-        default="PROMPT",
-    )
     should_stream: BoolProperty(name="Stream Data From IFC-SPF (Only for advanced users)", default=False)
     should_always_cache: BoolProperty(
         name="Always Cache Geometry",
@@ -726,9 +689,6 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences):
         bsdd_load_test_dictionaries: bool
         bsdd_baseurl: str
         should_disable_undo_on_save: bool
-        autosave_enabled: bool
-        autosave_interval_minutes: int
-        autosave_mode: Literal["PROMPT", "BACKUP"]
         should_stream: bool
         should_always_cache: bool
         occurrence_name_style: Literal["CLASS", "TYPE", "CUSTOM"]
@@ -877,12 +837,6 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences):
     def draw_other_settings(self, layout: bpy.types.UILayout, context: bpy.types.Context) -> None:
         layout.prop(self, "opening_focus_opacity")
         layout.prop(self, "should_disable_undo_on_save")
-        layout.separator()
-        layout.label(text="Autosave:")
-        layout.prop(self, "autosave_enabled")
-        if self.autosave_enabled:
-            layout.prop(self, "autosave_interval_minutes")
-            layout.prop(self, "autosave_mode")
         layout.prop(self, "should_stream")
         layout.prop(self, "should_always_cache")
         layout.label(text="bSDD:")

src/bonsai/bonsai/core/drawing.py

@@ -626,7 +626,8 @@ def sync_references(
 
     for reference_element in potential_reference_elements:
         if not drawing_tool.get_drawing_reference_annotation(drawing, reference_element):
-            if annotation := drawing_tool.generate_reference_annotation(drawing, reference_element, context):
+            annotation = drawing_tool.generate_reference_annotation(drawing, reference_element, context)
+            if annotation:
                 ifc.run("drawing.assign_product", relating_product=reference_element, related_object=annotation)
                 ifc.run("group.assign_group", group=group, products=[annotation])
                 collector.assign(ifc.get_object(annotation))

src/bonsai/bonsai/tool/__init__.py

@@ -80,6 +80,3 @@ from bonsai.tool.type import Type
 from bonsai.tool.unit import Unit
 from bonsai.tool.wall import Wall
 from bonsai.tool.web import Web
-
-# Have to move after import of tool.drawing
-from bonsai.tool.autosave import Autosave  # isort: skip

src/bonsai/bonsai/tool/autosave.py

@@ -1,188 +0,0 @@
-# Bonsai - OpenBIM Blender Add-on
-# Copyright (C) 2026
-#
-# This file is part of Bonsai.
-#
-# Bonsai is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Bonsai is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was generated with the assistance of an AI coding tool.
-
-from __future__ import annotations
-
-import atexit
-import logging
-import os
-from collections.abc import Callable
-from pathlib import Path
-from typing import Union
-
-import bpy
-
-import bonsai.tool as tool
-from bonsai.bim import export_ifc
-from bonsai.bim.module.model import preview_base
-
-AUTOSAVING_SUFFIX = "_autosaving.ifc"
-AUTOSAVED_SUFFIX = "_autosaved.ifc"
-
-_timer_callback: Union[Callable[[], None], None] = None
-# See cleanup_stale_autosave() for why this is a cached plain string rather
-# than looked up live.
-_active_ifc_path_cache: Union[str, None] = None
-
-
-class Autosave:
-    @classmethod
-    def get_paths(cls, ifc_path: Union[str, Path]) -> tuple[Path, Path, Path]:
-        path = Path(ifc_path)
-        stem = path.stem if path.suffix.lower() == ".ifc" else path.name
-        parent = path.parent
-        main_path = path if path.suffix.lower() == ".ifc" else parent / f"{stem}.ifc"
-        autosaving_path = parent / f"{stem}{AUTOSAVING_SUFFIX}"
-        autosaved_path = parent / f"{stem}{AUTOSAVED_SUFFIX}"
-        return main_path, autosaving_path, autosaved_path
-
-    @classmethod
-    def get_active_ifc_path(cls) -> Union[Path, None]:
-        props = tool.Blender.get_bim_props()
-        if not props.ifc_file:
-            return None
-        path = tool.Blender.ensure_blender_path_is_abs(Path(props.ifc_file))
-        if path.suffix.lower() != ".ifc":
-            return None
-        return path
-
-    @classmethod
-    def _update_active_ifc_path_cache(cls) -> None:
-        global _active_ifc_path_cache
-        ifc_path = cls.get_active_ifc_path()
-        _active_ifc_path_cache = ifc_path.as_posix() if ifc_path is not None else None
-
-    @classmethod
-    def is_enabled(cls) -> bool:
-        return bool(tool.Blender.get_addon_preferences().autosave_enabled)
-
-    @classmethod
-    def get_interval_seconds(cls) -> float:
-        minutes = tool.Blender.get_addon_preferences().autosave_interval_minutes
-        return max(1.0, float(minutes) * 60.0)
-
-    @classmethod
-    def is_eligible(cls) -> bool:
-        return cls.is_enabled() and tool.Ifc.get() is not None and cls.get_active_ifc_path() is not None
-
-    @classmethod
-    def cancel_timer(cls) -> None:
-        global _timer_callback
-        if _timer_callback is not None and bpy.app.timers.is_registered(_timer_callback):
-            bpy.app.timers.unregister(_timer_callback)
-        _timer_callback = None
-
-    @classmethod
-    def reset_timer(cls) -> None:
-        cls.cancel_timer()
-        cls._update_active_ifc_path_cache()
-        if not cls.is_eligible():
-            return
-
-        def on_timer() -> None:
-            cls._on_timer_expired()
-            return None
-
-        global _timer_callback
-        _timer_callback = on_timer
-        bpy.app.timers.register(on_timer, first_interval=cls.get_interval_seconds())
-
-    @classmethod
-    def _on_timer_expired(cls) -> None:
-        if not cls.is_eligible():
-            return
-
-        prefs = tool.Blender.get_addon_preferences()
-        bim_props = tool.Blender.get_bim_props()
-
-        if bim_props.is_dirty:
-            if prefs.autosave_mode == "PROMPT":
-                bpy.ops.bim.autosave_prompt("INVOKE_DEFAULT")
-            elif prefs.autosave_mode == "BACKUP":
-                try:
-                    cls.perform_backup(bpy.context)
-                except Exception as error:
-                    print(f"Bonsai: autosave backup failed: {error}")
-        cls.reset_timer()
-
-    @classmethod
-    def perform_backup(cls, context: bpy.types.Context) -> None:
-        ifc_path = cls.get_active_ifc_path()
-        if ifc_path is None:
-            return
-
-        _, autosaving_path, autosaved_path = cls.get_paths(ifc_path)
-        autosaving_path.parent.mkdir(parents=True, exist_ok=True)
-
-        tool.Parametric.commit_pending_edits()
-        preview_base.discard_pending_previews(context.scene)
-
-        logger = logging.getLogger("ExportIFC")
-        output_file = autosaving_path.as_posix().replace("\\", "/")
-        settings = export_ifc.IfcExportSettings.factory(context, output_file, logger)
-        export_ifc.IfcExporter(settings).export()
-
-        try:
-            os.replace(autosaving_path, autosaved_path)
-        except OSError:
-            if autosaving_path.is_file():
-                autosaving_path.unlink(missing_ok=True)
-            raise
-
-    @classmethod
-    def get_newer_autosaved_path(cls, ifc_path: Union[str, Path]) -> Union[str, None]:
-        path = Path(ifc_path)
-        if path.suffix.lower() != ".ifc" or not path.is_file():
-            return None
-
-        _, _, autosaved_path = cls.get_paths(path)
-        if not autosaved_path.is_file():
-            return None
-        if autosaved_path.stat().st_mtime > path.stat().st_mtime:
-            return autosaved_path.as_posix().replace("\\", "/")
-        return None
-
-    @classmethod
-    def cleanup_stale_autosave(cls) -> None:
-        """Remove the active IFC's autosave file(s) on a graceful shutdown.
-
-        Registered via `atexit`, which only runs on a normal interpreter
-        shutdown - never on an actual crash. So a deliberate quit (whether
-        the user saved or chose "don't save") clears the recovery file and
-        won't prompt on next startup, while a genuine crash leaves it in
-        place for recovery, since no atexit callbacks fire then.
-
-        Deliberately reads only `_active_ifc_path_cache` - a plain string
-        kept up to date by `reset_timer()` - rather than touching `bpy` here.
-        By the time `atexit` fires, Blender's own C++ side is torn down far
-        enough that even reading `bpy.context.scene` aborts the process
-        (std::bad_optional_access) instead of raising a catchable exception.
-        """
-        if _active_ifc_path_cache is None:
-            return
-        try:
-            _, autosaving_path, autosaved_path = cls.get_paths(_active_ifc_path_cache)
-            autosaving_path.unlink(missing_ok=True)
-            autosaved_path.unlink(missing_ok=True)
-        except Exception:
-            pass
-
-
-atexit.register(Autosave.cleanup_stale_autosave)

src/bonsai/bonsai/tool/collector.py

@@ -120,7 +120,8 @@ class Collector(bonsai.core.tool.Collector):
                 project_obj = tool.Ifc.get_object(tool.Ifc.get().by_type("IfcProject")[0])
                 cls.link_collection_child_safe(tool.Blender.get_object_bim_props(project_obj).collection, collection)
         elif element.is_a("IfcAnnotation") and (drawing_obj := cls.get_annotation_drawing_obj(element)):
-            cls.link_collection_object_safe(tool.Blender.get_object_bim_props(drawing_obj).collection, obj)
+            target_collection = tool.Blender.get_object_bim_props(drawing_obj).collection
+            cls.link_collection_object_safe(target_collection, obj)
         elif container := ifcopenshell.util.element.get_container(element):
             while container.is_a("IfcSpace"):
                 container = ifcopenshell.util.element.get_aggregate(container)

src/bonsai/bonsai/tool/drawing.py

@@ -1953,19 +1953,29 @@ class Drawing(bonsai.core.tool.Drawing):
         if camera.data.type != "ORTHO":
             return
 
-        settings = ifcopenshell.geom.settings()
-        settings.set("dimensionality", ifcopenshell.ifcopenshell_wrapper.CURVES_SURFACES_AND_SOLIDS)
-        geometry = ifcopenshell.geom.create_shape(settings, axis.AxisCurve)
-        verts = ifcopenshell.util.shape.get_vertices(geometry)
         grid = (axis.PartOfU or axis.PartOfV or axis.PartOfW)[0]
-        m = ifcopenshell.util.placement.get_local_placement(grid.ObjectPlacement)
+        axis_obj = tool.Ifc.get_object(axis)
+        if axis_obj and axis_obj.data and len(axis_obj.data.vertices) >= 2:
+            m = np.array(axis_obj.matrix_world)
+            verts = [np.array(v.co) for v in axis_obj.data.vertices[:2]]
+        else:
+            settings = ifcopenshell.geom.settings()
+            settings.set("dimensionality", ifcopenshell.ifcopenshell_wrapper.CURVES_SURFACES_AND_SOLIDS)
+            geometry = ifcopenshell.geom.create_shape(settings, axis.AxisCurve)
+            verts = list(ifcopenshell.util.shape.get_vertices(geometry)[:2])
+            grid_obj = tool.Ifc.get_object(grid)
+            if grid_obj:
+                m = np.array(grid_obj.matrix_world)
+            else:
+                m = ifcopenshell.util.placement.get_local_placement(grid.ObjectPlacement)
         im = camera.matrix_world.inverted()
-        v1, v2 = [im @ Vector((m @ np.append(v, 1.0))[:3]) for v in verts[:2]]
+        v1, v2 = [im @ Vector((m @ np.append(v[:3], 1.0))[:3]) for v in verts]
 
         target_view = tool.Drawing.get_drawing_target_view(drawing)
         if target_view in ("PLAN_VIEW", "REFLECTED_PLAN_VIEW"):
             bounds = helper.ortho_view_frame(camera.data)
-            if not (points := helper.clip_segment(bounds, [v1, v2])):
+            points = helper.clip_segment(bounds, [v1, v2])
+            if not points:
                 return
         elif target_view in ("ELEVATION_VIEW", "SECTION_VIEW"):
             bounds = helper.ortho_view_frame(camera.data)
@@ -2183,6 +2193,7 @@ class Drawing(bonsai.core.tool.Drawing):
     def sync_object_placement(cls, obj: bpy.types.Object) -> Union[ifcopenshell.entity_instance, None]:
         blender_matrix = np.array(obj.matrix_world)
         element = tool.Ifc.get_entity(obj)
+        is_moved = tool.Ifc.is_moved(obj)
         if tool.Geometry.is_scaled(obj):
             bpy.ops.bim.update_representation(obj=obj.name)
             return element
@@ -2199,7 +2210,8 @@ class Drawing(bonsai.core.tool.Drawing):
         grid_obj = tool.Ifc.get_object(grid)
         if grid_obj:
             cls.sync_object_placement(grid_obj)
-            if grid_obj.matrix_world != obj.matrix_world:
+            matrices_differ = grid_obj.matrix_world != obj.matrix_world
+            if matrices_differ:
                 bpy.ops.bim.update_representation(obj=obj.name)
         tool.Geometry.record_object_position(obj)
 

src/bonsai/bonsai/tool/geometry.py

@@ -2670,6 +2670,11 @@ class Geometry(bonsai.core.tool.Geometry):
         # copy the actual class
         new = bonsai.core.root.copy_class(tool.Ifc, tool.Collector, tool.Geometry, tool.Root, obj=new_obj)
 
+        # Give each duplicated IfcGridAxis its own AxisCurve so it doesn't
+        # share geometry with the source axis.
+        if new and new.is_a("IfcGridAxis"):
+            tool.Model.create_axis_curve(new_obj, new)
+
         # clean up the orphaned mesh with ifc id of the original object to avoid confusion
         # IfcGridAxis keeps the same mesh data (it's pointing to ifc id 0, so it's not a problem)
         if new and temp_data and not new.is_a("IfcGridAxis"):

src/bonsai/test/bim/feature/project.feature

@@ -920,6 +920,21 @@ Scenario: Export IFC - with moved grid axis location synchronised
     And I load previously saved IFC project
     Then the object "IfcGridAxis/01" bottom left corner is at "1,-2,0"
 
+Scenario: Export IFC - with duplicate-of-duplicate grid axis locations preserved
+    Given an empty IFC project
+    And I press "bim.add_grid"
+    And I set "scene.BIMGridProperties.is_locked" to "False"
+    And the object "IfcGridAxis/01" is selected
+    And I duplicate the selected objects
+    And the object "IfcGridAxis/01.001" is moved to "1,0,0"
+    And the object "IfcGridAxis/01.001" is selected
+    And I duplicate the selected objects
+    And the object "IfcGridAxis/01.002" is moved to "2,0,0"
+    When I save IFC project
+    And I load previously saved IFC project
+    Then the object "IfcGridAxis/01.001" bottom left corner is at "1,-2,0"
+    And the object "IfcGridAxis/01.002" bottom left corner is at "2,-2,0"
+
 Scenario: Export IFC - with changed object scale ignored
     Given an empty IFC project
     And I add a cube

src/bonsai/test/bim/module/project/test_autosave.py

@@ -1,68 +0,0 @@
-# Bonsai - OpenBIM Blender Add-on
-# Copyright (C) 2026
-#
-# This file is part of Bonsai.
-#
-# Bonsai is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Bonsai is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This file was generated with the assistance of an AI coding tool.
-
-import os
-import time
-from pathlib import Path
-
-import pytest
-
-from bonsai.tool.autosave import AUTOSAVED_SUFFIX, AUTOSAVING_SUFFIX, Autosave
-
-pytestmark = pytest.mark.project
-
-
-class TestAutosavePaths:
-    def test_get_paths_for_ifc_file(self):
-        main_path, autosaving_path, autosaved_path = Autosave.get_paths("/tmp/myfile.ifc")
-        assert main_path == Path("/tmp/myfile.ifc")
-        assert autosaving_path == Path(f"/tmp/myfile{AUTOSAVING_SUFFIX}")
-        assert autosaved_path == Path(f"/tmp/myfile{AUTOSAVED_SUFFIX}")
-
-    def test_get_newer_autosaved_path_when_missing(self, tmp_path):
-        ifc_path = tmp_path / "myfile.ifc"
-        ifc_path.write_text("ifc")
-        assert Autosave.get_newer_autosaved_path(ifc_path) is None
-
-    def test_get_newer_autosaved_path_when_older(self, tmp_path):
-        ifc_path = tmp_path / "myfile.ifc"
-        autosaved_path = tmp_path / f"myfile{AUTOSAVED_SUFFIX}"
-        ifc_path.write_text("ifc")
-        autosaved_path.write_text("autosaved")
-        past = time.time() - 10
-        os.utime(ifc_path, (past, past))
-        os.utime(autosaved_path, (time.time(), time.time()))
-        assert Autosave.get_newer_autosaved_path(ifc_path) == autosaved_path.as_posix()
-
-    def test_get_newer_autosaved_path_when_not_newer(self, tmp_path):
-        ifc_path = tmp_path / "myfile.ifc"
-        autosaved_path = tmp_path / f"myfile{AUTOSAVED_SUFFIX}"
-        ifc_path.write_text("ifc")
-        autosaved_path.write_text("autosaved")
-        now = time.time()
-        os.utime(ifc_path, (now, now))
-        past = now - 10
-        os.utime(autosaved_path, (past, past))
-        assert Autosave.get_newer_autosaved_path(ifc_path) is None
-
-    def test_get_newer_autosaved_path_ignores_non_ifc(self, tmp_path):
-        path = tmp_path / "myfile.ifczip"
-        path.write_text("zip")
-        assert Autosave.get_newer_autosaved_path(path) is None

src/ifcconvert/IfcConvert.cpp

@@ -252,10 +252,6 @@ int main(int argc, char** argv) {
 		("stderr-progress", "output progress to stderr stream")
 		("yes,y", "answer 'yes' automatically to possible confirmation queries (e.g. overwriting an existing output file)")
 		("no-progress", "suppress possible progress bar type of prints that use carriage return")
-		("fail-on-error", "return a non-zero exit code when one or more errors were logged during "
-			"geometry conversion (e.g. an element failed to convert). By default IfcConvert exits "
-			"successfully as long as an output file could be written, even if some elements were "
-			"silently dropped. Enable this flag so scripts and CI can detect partial conversions.")
 		("log-format", po::value<std::string>(&log_format), "log format: plain or json")
 		("log-file", new po::typed_value<path_t, char_t>(&log_file), "redirect log output to file");
 
@@ -453,7 +449,6 @@ int main(int argc, char** argv) {
 
 	const bool mmap = vmap.count("mmap") != 0;
 	const bool no_progress = vmap.count("no-progress") != 0;
-	const bool fail_on_error = vmap.count("fail-on-error") != 0;
 	const bool quiet = vmap.count("quiet") != 0;
 	const bool stderr_progress = vmap.count("stderr-progress") != 0;
 
@@ -890,7 +885,6 @@ int main(int argc, char** argv) {
 	}
 
 	if (!serializer->ready()) {
-		logger.Error("SYS", 25, "Unable to open output file '" + IfcUtil::path::to_utf8(output_filename) + "' for writing; check that the directory exists and is writable");
 		IfcUtil::path::delete_file(IfcUtil::path::to_utf8(output_temp_filename));
 		write_log(!quiet);
 		return EXIT_FAILURE;
@@ -1226,11 +1220,6 @@ int main(int argc, char** argv) {
 		successful = false;
 	}
 
-	if (fail_on_error && logger.MaxSeverity() >= Logger::LOG_ERROR) {
-		logger.Error("SYS", 26, "Errors encountered during processing, failing due to --fail-on-error.");
-		successful = false;
-	}
-
 	if (logger.Verbosity() == Logger::LOG_PERF) {
 		logger.PrintPerformanceStats();
 	}

src/ifcgeom/ConversionSettings.h

@@ -361,8 +361,8 @@ namespace ifcopenshell {
 
 			struct CircleSegments : public SettingBase<CircleSegments, int> {
 				static constexpr const char* const name = "circle-segments";
-				static constexpr const char* const description = "Number of segments to approximate full circles in the CGAL kernel. When 0 (the default) the segment count is derived from mesher-linear-deflection instead, so curves stay within the deflection tolerance regardless of radius.";
-				static constexpr int defaultvalue = 0;
+				static constexpr const char* const description = "Number of segments to approximate full circles in CGAL kernel.";
+				static constexpr int defaultvalue = 16;
 			};
 
 			struct CgalSmoothAngleDegrees : public SettingBase<CgalSmoothAngleDegrees, double> {

src/ifcgeom/kernels/cgal/CgalKernel.cpp

@@ -391,11 +391,6 @@ namespace {
 		}
 	};
 
-	// Representative radius used to size the polygonal approximation of a conic.
-	// For an ellipse the larger semi-axis is the conservative choice.
-	inline double conic_radius(const taxonomy::circle::ptr& c) { return c->radius; }
-	inline double conic_radius(const taxonomy::ellipse::ptr& e) { return e->radius > e->radius2 ? e->radius : e->radius2; }
-
 	struct cgal_curve_creation_visitor {
 		Settings& settings_;
 		parameter_range param;
@@ -430,36 +425,7 @@ namespace {
 			if (b <= a) {
 				b += 2 * M_PI;
 			}
-			const double span = std::fabs(a - b);
-			// CircleSegments controls how conics (circles, ellipses, arcs) are approximated
-			// in the CGAL kernel. Two modes, one or the other:
-			//  - CircleSegments == 0 (the default): the segment count is derived from
-			//    MesherLinearDeflection, so the chord deviation stays within the mesher's
-			//    linear deflection regardless of radius. This matches the deflection based
-			//    meshing the OpenCascade kernel already does and fixes issue #8051, where
-			//    large radius arcs (curved curtain wall mullions) collapsed to straight chords
-			//    because a fixed segment count is radius agnostic.
-			//  - CircleSegments > 0: it is used directly as the number of segments for a full
-			//    circle, giving deterministic, radius independent output.
-			int num_segments;
-			const int circle_segments = settings_.get<settings::CircleSegments>().get();
-			if (circle_segments > 0) {
-				num_segments = (int)std::ceil(span / (2 * M_PI) * circle_segments);
-			} else {
-				const double radius = conic_radius(t);
-				const double deflection = settings_.get<settings::MesherLinearDeflection>().get();
-				if (deflection > 0. && radius > deflection) {
-					const double max_segment_angle = 2.0 * std::acos(1.0 - deflection / radius);
-					num_segments = (int)std::ceil(span / max_segment_angle);
-				} else {
-					// Radius within the deflection tolerance (or no deflection set): a chord per
-					// quarter turn already keeps the deviation within tolerance.
-					num_segments = (int)std::ceil(span / (M_PI / 2.));
-				}
-			}
-			if (num_segments < 1) {
-				num_segments = 1;
-			}
+			int num_segments = (int)std::ceil(std::fabs(a - b) / (2 * M_PI) * settings_.get<settings::CircleSegments>().get());
 			double du = (b - a) / num_segments;
 			taxonomy::point3 P;
 			// @nb for loop is not inclusive of the both end points

src/ifcgeom/kernels/opencascade/face.cpp

@@ -31,7 +31,6 @@
 #include <ShapeFix_Shape.hxx>
 #include <ShapeFix_ShapeTolerance.hxx>
 #include <BRep_Tool.hxx>
-#include <BRepExtrema_DistShapeShape.hxx>
 
 #include <Standard_Macro.hxx>
 #include <TopoDS_Shape.hxx>
@@ -357,27 +356,6 @@ bool OpenCascadeKernel::convert(const taxonomy::face::ptr face, TopoDS_Shape& re
 		return false;
 	}
 
-	// #527: A face whose inner boundary intersects the outer boundary (or
-	// another inner boundary) is invalid per the schema. Open Cascade heals or
-	// drops such a face silently, so the intended hole is lost with no
-	// diagnostic. The distance between two non-intersecting loops is strictly
-	// positive; a distance at (or below) the modelling precision means the
-	// boundaries touch or cross. Emit a clear warning so the invalid input is
-	// not silently lost. wires() is ordered outer-first, inner-bounds after.
-	if (fd.wires().size() > 1) {
-		const auto& fwires = fd.wires();
-		bool reported = false;
-		for (size_t i = 1; i < fwires.size() && !reported; ++i) {
-			for (size_t j = 0; j < i && !reported; ++j) {
-				BRepExtrema_DistShapeShape dss(fwires[i], fwires[j]);
-				if (dss.IsDone() && dss.Value() < precision_) {
-					logger().Warning("GEO", 402, "Face inner boundary intersects another face boundary", face->instance);
-					reported = true;
-				}
-			}
-		}
-	}
-
 	if (fd.surface().IsNull()) {
 		// Use the first wire to find a plane manually for polygonal wires
 		const TopoDS_Wire& wire = fd.wires().front();

src/ifcgeom/mapping/IfcAsymmetricIShapeProfileDef.cpp

@@ -1,93 +0,0 @@
-// This file was generated with the assistance of an AI coding tool.
-/********************************************************************************
- *                                                                              *
- * This file is part of IfcOpenShell.                                           *
- *                                                                              *
- * IfcOpenShell is free software: you can redistribute it and/or modify         *
- * it under the terms of the Lesser GNU General Public License as published by  *
- * the Free Software Foundation, either version 3.0 of the License, or          *
- * (at your option) any later version.                                          *
- *                                                                              *
- * IfcOpenShell is distributed in the hope that it will be useful,              *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of               *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                 *
- * Lesser GNU General Public License for more details.                          *
- *                                                                              *
- * You should have received a copy of the Lesser GNU General Public License     *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.         *
- *                                                                              *
- ********************************************************************************/
-
-#include "mapping.h"
-#define mapping POSTFIX_SCHEMA(mapping)
-using namespace ifcopenshell::geometry;
-
-#include "../profile_helper.h"
-
-// In IFC2X3 IfcAsymmetricIShapeProfileDef is a subtype of IfcIShapeProfileDef and is
-// therefore dispatched (and handled) by the IfcIShapeProfileDef mapping. From IFC4
-// onwards it is a standalone subtype of IfcParameterizedProfileDef with its own
-// Bottom*/Top* attributes, so nothing mapped it and the extrusion came out empty.
-// The presence of the standalone BottomFlangeWidth attribute is the discriminator:
-// it is only defined in the schemas where the type is standalone (IFC4 / IFC4X3).
-#ifdef SCHEMA_IfcAsymmetricIShapeProfileDef_HAS_BottomFlangeWidth
-
-taxonomy::ptr mapping::map_impl(const IfcSchema::IfcAsymmetricIShapeProfileDef* inst) {
-	// Bottom flange (half width), overall depth (half), web (half thickness).
-	const double xb = inst->BottomFlangeWidth() / 2.0 * length_unit_;
-	const double xt = inst->TopFlangeWidth() / 2.0 * length_unit_;
-	const double y = inst->OverallDepth() / 2.0 * length_unit_;
-	const double d1 = inst->WebThickness() / 2.0 * length_unit_;
-
-	// Bottom flange thickness; top flange thickness defaults to the bottom one.
-	const double ftb = inst->BottomFlangeThickness() * length_unit_;
-	const double ftt = inst->TopFlangeThickness().get_value_or(inst->BottomFlangeThickness()) * length_unit_;
-
-	// Optional fillet radii (web/flange transition) and flange edge radii.
-	const double fb = inst->BottomFlangeFilletRadius().get_value_or(0.) * length_unit_;
-	const double ft_top = inst->TopFlangeFilletRadius().get_value_or(0.) * length_unit_;
-	const double feb = inst->BottomFlangeEdgeRadius().get_value_or(0.) * length_unit_;
-	const double fet = inst->TopFlangeEdgeRadius().get_value_or(0.) * length_unit_;
-
-	// Optional flange slopes: the inner edge of the flange rises towards the web.
-	const double bottomSlope = inst->BottomFlangeSlope().get_value_or(0.) * angle_unit_;
-	const double topSlope = inst->TopFlangeSlope().get_value_or(0.) * angle_unit_;
-	const double dyb = (xb - d1) * tan(bottomSlope);
-	const double dyt = (xt - d1) * tan(topSlope);
-
-	const double tol = settings_.get<settings::Precision>().get();
-
-	if (xb < tol || xt < tol || y < tol || d1 < tol || ftb < tol || ftt < tol) {
-		logger_.Message(Logger::LOG_NOTICE, "GEO", 264, "Skipping zero sized profile:", inst);
-		return nullptr;
-	}
-
-	taxonomy::matrix4::ptr m4;
-	bool has_position = true;
-#ifdef SCHEMA_IfcParameterizedProfileDef_Position_IS_OPTIONAL
-	has_position = !!inst->Position();
-#endif
-	if (has_position) {
-		m4 = taxonomy::cast<taxonomy::matrix4>(map(inst->Position()));
-	}
-
-	// Twelve corner points, running counter-clockwise from the bottom-left, with the
-	// bottom flange (xb) possibly wider than the top flange (xt). Fillet/edge radii are
-	// attached to the corner they round, matching the symmetric IfcIShapeProfileDef.
-	return profile_helper(m4, {
-		{{-xb,-y}},
-		{{xb,-y}},
-		{{xb,-y + ftb}, {feb}},
-		{{d1,-y + ftb + dyb},{fb} },
-		{{d1,y - ftt - dyt},{ft_top} },
-		{{xt,y - ftt}, {fet}},
-		{{xt,y}},
-		{{-xt,y}},
-		{{-xt,y - ftt}, {fet}},
-		{{-d1,y - ftt - dyt},{ft_top} },
-		{{-d1,-y + ftb + dyb},{fb} },
-		{{-xb,-y + ftb}, {feb}}
-	});
-}
-
-#endif

src/ifcgeom/mapping/IfcPolygonalFaceSet.cpp

@@ -39,25 +39,8 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcPolygonalFaceSet* inst) {
 
 	int max_index = (int)points.size();
 
-	// When the optional PnIndex is present, CoordIndex values do not index into
-	// CoordList directly but into PnIndex, which in turn remaps to CoordList.
-	// Both index levels are 1-based per the IFC specification.
-	auto pn_index = inst->PnIndex();
-	auto resolve = [&](int idx) -> const taxonomy::point3::ptr& {
-		if (pn_index) {
-			if (idx < 1 || idx > (int)pn_index->size()) {
-				throw IfcParse::IfcException("IfcPolygonalFaceSet PnIndex out of bounds for index " + boost::lexical_cast<std::string>(idx));
-			}
-			idx = (*pn_index)[idx - 1];
-		}
-		if (idx < 1 || idx > max_index) {
-			throw IfcParse::IfcException("IfcPolygonalFaceSet index out of bounds for index " + boost::lexical_cast<std::string>(idx));
-		}
-		return points[idx - 1];
-	};
-
 	auto shell = taxonomy::make<taxonomy::shell>();
-
+	
 	for (auto& f : *polygonal_faces) {
 		auto fa = taxonomy::make<taxonomy::face>();
 		shell->children.push_back(fa);
@@ -69,14 +52,17 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcPolygonalFaceSet* inst) {
 			auto indices = f->CoordIndex();
 			taxonomy::point3::ptr previous;
 			for (std::vector<int>::const_iterator jt = indices.begin(); jt != indices.end(); ++jt) {
-				auto current = resolve(*jt);
+				if (*jt < 1 || *jt > max_index) {
+					throw IfcParse::IfcException("IfcPolygonalFaceSet index out of bounds for index " + boost::lexical_cast<std::string>(*jt));
+				}
+				auto current = points[(*jt) - 1];
 				if (jt != indices.begin()) {
 					loop->children.push_back(taxonomy::make<taxonomy::edge>(previous, current));
 				}
 				previous = current;
 			}
 			if (!indices.empty()) {
-				auto current = resolve(indices.front());
+				auto current = points[indices.front() - 1];
 				loop->children.push_back(taxonomy::make<taxonomy::edge>(previous, current));
 			}
 		}
@@ -91,14 +77,17 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcPolygonalFaceSet* inst) {
 					loop->external = false;
 
 					for (std::vector<int>::const_iterator jt = li.begin(); jt != li.end(); ++jt) {
-						auto current = resolve(*jt);
+						if (*jt < 1 || *jt > max_index) {
+							throw IfcParse::IfcException("IfcPolygonalFaceSet index out of bounds for index " + boost::lexical_cast<std::string>(*jt));
+						}
+						auto current = points[(*jt) - 1];
 						if (jt != li.begin()) {
 							loop->children.push_back(taxonomy::make<taxonomy::edge>(previous, current));
 						}
 						previous = current;
 					}
 					if (!li.empty()) {
-						auto current = resolve(li.front());
+						auto current = points[li.front() - 1];
 						loop->children.push_back(taxonomy::make<taxonomy::edge>(previous, current));
 					}
 				}

src/ifcgeom/mapping/IfcTriangulatedFaceSet.cpp

@@ -39,23 +39,6 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcTriangulatedFaceSet* inst) {
 
 	int max_index = (int)points.size();
 
-	// When the optional PnIndex is present, CoordIndex values do not index into
-	// CoordList directly but into PnIndex, which in turn remaps to CoordList.
-	// Both index levels are 1-based per the IFC specification.
-	auto pn_index = inst->PnIndex();
-	auto resolve = [&](int idx) -> const taxonomy::point3::ptr& {
-		if (pn_index) {
-			if (idx < 1 || idx > (int)pn_index->size()) {
-				throw IfcParse::IfcException("IfcTriangulatedFaceSet PnIndex out of bounds for index " + boost::lexical_cast<std::string>(idx));
-			}
-			idx = (*pn_index)[idx - 1];
-		}
-		if (idx < 1 || idx > max_index) {
-			throw IfcParse::IfcException("IfcTriangulatedFaceSet index out of bounds for index " + boost::lexical_cast<std::string>(idx));
-		}
-		return points[idx - 1];
-	};
-
 	auto shell = taxonomy::make<taxonomy::shell>();
 
 	for (auto& indices : indices_list) {
@@ -68,7 +51,10 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcTriangulatedFaceSet* inst) {
 			loop->external = true;
 			taxonomy::point3::ptr first, previous;
 			for (std::vector<int>::const_iterator jt = indices.begin(); jt != indices.end(); ++jt) {
-				const taxonomy::point3::ptr& current = resolve(*jt);
+				if (*jt < 1 || *jt > max_index) {
+					throw IfcParse::IfcException("IfcTriangulatedFaceSet index out of bounds for index " + boost::lexical_cast<std::string>(*jt));
+				}
+				const taxonomy::point3::ptr& current = points[(*jt) - 1];
 				if (jt == indices.begin()) {
 					first = current;
 				} else {

src/ifcgeom/mapping/mapping.i

@@ -89,11 +89,7 @@ BIND(IfcRectangleHollowProfileDef);
 BIND(IfcRectangleProfileDef);
 BIND(IfcTrapeziumProfileDef);
 BIND(IfcCShapeProfileDef);
-// In IFC2X3 IfcAsymmetricIShapeProfileDef is a subtype of IfcIShapeProfileDef and is
-// mapped by it; from IFC4 onwards it is a standalone type and needs its own binding.
-#ifdef SCHEMA_IfcAsymmetricIShapeProfileDef_HAS_BottomFlangeWidth
-BIND(IfcAsymmetricIShapeProfileDef);
-#endif
+// IfcAsymmetricIShapeProfileDef included
 BIND(IfcIShapeProfileDef);
 BIND(IfcLShapeProfileDef);
 BIND(IfcTShapeProfileDef);

src/ifcopenshell-python/docs/ifcconvert/usage.rst

@@ -311,12 +311,8 @@ CLI Manual
                                             output.
       --force-space-transparency arg        Overrides transparency of spaces in 
                                             geometry output.
-      --circle-segments arg (= 0)           Number of segments to approximate full
-                                            circles in the CGAL kernel. When 0 (the
-                                            default) the segment count is derived from
-                                            mesher-linear-deflection instead, so curves
-                                            stay within the deflection tolerance
-                                            regardless of radius.
+      --circle-segments arg (= 16)          Number of segments to approximate full 
+                                            circles in CGAL kernel.
       --cgal-smooth-angle-degrees arg (= -1)
                                             Angle in degrees under which adjacent 
                                             facets will have averaged vertex 

src/ifcopenshell-python/docs/ifcopenshell/geometry_settings.rst

@@ -228,10 +228,10 @@ circle-segments
 +------+-----------------------+---------+
 | Type | IfcConvert Option     | Default |
 +======+=======================+=========+
-| INT  | ``--circle-segments`` | 0       |
+| INT  | ``--circle-segments`` | 16      |
 +------+-----------------------+---------+
 
-Number of segments to approximate full circles in the CGAL kernel. When 0 (the default) the segment count is derived from mesher-linear-deflection instead, so curves stay within the deflection tolerance regardless of radius.
+Number of segments to approximate full circles in CGAL kernel.
 
 context-identifiers
 ^^^^^^^^^^^^^^^^^^^

src/ifcopenshell-python/ifcopenshell/api/grid/create_axis_curve.py

@@ -78,7 +78,8 @@ def create_axis_curve(
         points /= unit_scale
 
     grid = next(i for i in file.get_inverse(grid_axis) if i.is_a("IfcGrid"))
-    grid_matrix_i = np.linalg.inv(ifcopenshell.util.placement.get_local_placement(grid.ObjectPlacement))
+    grid_placement = ifcopenshell.util.placement.get_local_placement(grid.ObjectPlacement)
+    grid_matrix_i = np.linalg.inv(grid_placement)
     p1, p2 = ifc_safe_vector_type(np_apply_matrix(points, grid_matrix_i))
     grid_axis.AxisCurve = file.create_entity(
         "IfcPolyline",
@@ -88,5 +89,5 @@ def create_axis_curve(
         ),
     )
 
-    if existing_curve:
+    if existing_curve and file.get_total_inverses(existing_curve) == 0:
         ifcopenshell.util.element.remove_deep2(file, existing_curve)

src/ifcopenshell-python/ifcopenshell/geom/main.py

@@ -370,17 +370,6 @@ CLASH_TYPE_ITEMS = ("protrusion", "pierce", "collision", "clearance")
 
 
 class tree(ifcopenshell_wrapper.tree):
-    @staticmethod
-    def _wrap(e: ifcopenshell_wrapper.entity_instance) -> entity_instance:
-        inst = entity_instance(e)
-        # #3189 attach the owning file so that equality and hashing of
-        # selected instances use the fast step-id based path instead of
-        # falling back to a slow recursive attribute comparison.
-        ptr = e.file_pointer()
-        if ptr:
-            inst.wrapped_data.file = file.from_pointer(ptr)
-        return inst
-
     def __init__(self, file: Optional[file] = None, settings: Optional[settings] = None):
         args = [self]
         if file is not None:
@@ -423,7 +412,7 @@ class tree(ifcopenshell_wrapper.tree):
                 args.append(kwargs.get("completely_within", False))
                 if "extend" in kwargs:
                     args.append(kwargs["extend"])
-        return [self._wrap(e) for e in ifcopenshell_wrapper.tree.select(*args)]
+        return [entity_instance(e) for e in ifcopenshell_wrapper.tree.select(*args)]
 
     def select_box(self, value, **kwargs) -> list[entity_instance]:
         def unwrap(value):
@@ -438,7 +427,7 @@ class tree(ifcopenshell_wrapper.tree):
             args.append(kwargs.get("completely_within", False))
         if "extend" in kwargs:
             args.append(kwargs.get("extend", -1.0e-5))
-        return [self._wrap(e) for e in ifcopenshell_wrapper.tree.select_box(*args)]
+        return [entity_instance(e) for e in ifcopenshell_wrapper.tree.select_box(*args)]
 
     def clash_intersection_many(
         self,

src/ifcopenshell-python/test/api/grid/test_create_axis_curve.py

@@ -0,0 +1,88 @@
+# IfcOpenShell - IFC toolkit and geometry engine
+# Copyright (C) 2021 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of IfcOpenShell.
+#
+# IfcOpenShell is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# IfcOpenShell is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with IfcOpenShell.  If not, see <http://www.gnu.org/licenses/>.
+
+import numpy as np
+
+import ifcopenshell.api.grid
+import test.bootstrap
+
+
+class TestCreateAxisCurve(test.bootstrap.IFC4):
+    def make_grid_with_axis(self, axis_tag="A"):
+        grid = self.file.createIfcGrid()
+        grid.ObjectPlacement = self.file.createIfcLocalPlacement(
+            RelativePlacement=self.file.createIfcAxis2Placement3D(
+                Location=self.file.createIfcCartesianPoint([0.0, 0.0, 0.0])
+            )
+        )
+        axis = ifcopenshell.api.grid.create_grid_axis(
+            self.file, axis_tag=axis_tag, same_sense=True, uvw_axes="UAxes", grid=grid
+        )
+        return grid, axis
+
+    def test_creates_a_polyline_axis_curve(self):
+        _, axis = self.make_grid_with_axis()
+        ifcopenshell.api.grid.create_axis_curve(
+            self.file, p1=np.array([0.0, 0.0, 0.0]), p2=np.array([10.0, 0.0, 0.0]), grid_axis=axis
+        )
+        assert axis.AxisCurve is not None
+        assert axis.AxisCurve.is_a("IfcPolyline")
+        assert len(axis.AxisCurve.Points) == 2
+
+    def test_replaces_existing_curve_when_unshared(self):
+        """Calling create_axis_curve again on the same axis replaces the old curve
+        and removes the old curve from the file when nothing else references it."""
+        _, axis = self.make_grid_with_axis()
+        ifcopenshell.api.grid.create_axis_curve(
+            self.file, p1=np.array([0.0, 0.0, 0.0]), p2=np.array([10.0, 0.0, 0.0]), grid_axis=axis
+        )
+        old_curve_id = axis.AxisCurve.id()
+        ifcopenshell.api.grid.create_axis_curve(
+            self.file, p1=np.array([1.0, 0.0, 0.0]), p2=np.array([11.0, 0.0, 0.0]), grid_axis=axis
+        )
+        assert axis.AxisCurve.id() != old_curve_id
+        assert self.file.by_id(old_curve_id) is None
+
+    def test_does_not_remove_shared_curve(self):
+        """When two axes share the same AxisCurve (e.g. after a shallow copy during
+        duplication), updating one axis must not destroy the curve still referenced
+        by the other axis."""
+        grid, axis = self.make_grid_with_axis()
+        axis2 = ifcopenshell.api.grid.create_grid_axis(
+            self.file, axis_tag="B", same_sense=True, uvw_axes="UAxes", grid=grid
+        )
+        ifcopenshell.api.grid.create_axis_curve(
+            self.file, p1=np.array([0.0, 0.0, 0.0]), p2=np.array([10.0, 0.0, 0.0]), grid_axis=axis
+        )
+        shared_curve = axis.AxisCurve
+        shared_curve_id = shared_curve.id()
+        # Simulate what copy_class produces: a duplicate axis that shares the
+        # source's AxisCurve rather than having its own copy.
+        axis2.AxisCurve = shared_curve
+        assert self.file.get_total_inverses(shared_curve) == 2
+
+        # Updating axis1's curve must not remove the curve that axis2 still needs.
+        ifcopenshell.api.grid.create_axis_curve(
+            self.file, p1=np.array([1.0, 0.0, 0.0]), p2=np.array([11.0, 0.0, 0.0]), grid_axis=axis
+        )
+        assert axis2.AxisCurve.id() == shared_curve_id
+        assert self.file.by_id(shared_curve_id) is not None
+
+
+class TestCreateAxisCurveIFC2X3(test.bootstrap.IFC2X3, TestCreateAxisCurve):
+    pass

src/ifcparse/IfcUtil.cpp

@@ -187,15 +187,6 @@ void IfcUtil::sanitate_material_name(std::string& str) {
 }
 
 void IfcUtil::escape_xml(std::string& str) {
-    // Strip characters that are illegal in XML 1.0. Control characters other
-    // than tab (0x09), newline (0x0A) and carriage return (0x0D) are not valid
-    // XML 1.0 characters and cannot even be represented as numeric character
-    // references, so they would otherwise make the serialized XML/SVG output
-    // non-well-formed. Bytes belonging to a valid UTF-8 multibyte sequence are
-    // always >= 0x80, so filtering on the low control range leaves them intact.
-    str.erase(std::remove_if(str.begin(), str.end(), [](unsigned char c) {
-        return c < 0x20 && c != '\t' && c != '\n' && c != '\r';
-    }), str.end());
     boost::replace_all(str, "&", "&amp;");
     boost::replace_all(str, "\"", "&quot;");
     boost::replace_all(str, "'", "&apos;");

src/serializers/schema_dependent/XmlSerializer.cpp

@@ -305,7 +305,7 @@ ptree* descend(Logger& logger, ifcopenshell::geometry::abstract_mapping* mapping
 			<IfcSchema::IfcObject, IfcSchema::IfcRelDefinesByProperties, IfcSchema::IfcPropertySetDefinition>
 			(logger, object, &IfcSchema::IfcObject::IsDefinedBy, &IfcSchema::IfcRelDefinesByProperties::RelatingPropertyDefinition);
 
-#ifdef SCHEMA_HAS_IfcPropertySetDefinitionSet
+#ifdef SCHEMAS_HAS_IfcPropertySetDefinitionSet
 		aggregate_of<IfcSchema::IfcPropertySetDefinitionSet>::ptr property_set_sets = get_related
 			<IfcSchema::IfcObject, IfcSchema::IfcRelDefinesByProperties, IfcSchema::IfcPropertySetDefinitionSet>
 			(logger, object, &IfcSchema::IfcObject::IsDefinedBy, &IfcSchema::IfcRelDefinesByProperties::RelatingPropertyDefinition);