From 3409c656ca91dbd82bb9428645e956e740aaf45c Mon Sep 17 00:00:00 2001 From: Ryan Schultz Date: Mon, 25 May 2026 08:03:58 -0500 Subject: [PATCH] Fix workspace.py is_manual_reference block ordering for build compatibility Move is_manual_reference UI block to before _DIMENSION_TYPES to match the position established by PR #7965's conflict resolution already present in the build. The prior merge fix (66fcad84e3) placed it after _DIMENSION_TYPES, causing a 3-way merge conflict when the build's #7965 has it before. Co-Authored-By: Claude Sonnet 4.6 --- src/bonsai/bonsai/bim/module/drawing/workspace.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/drawing/workspace.py b/src/bonsai/bonsai/bim/module/drawing/workspace.py index a28f2f32e1..fbc763a48f 100644 --- a/src/bonsai/bonsai/bim/module/drawing/workspace.py +++ b/src/bonsai/bonsai/bim/module/drawing/workspace.py @@ -270,15 +270,15 @@ class AnnotationToolUI: add_layout_hotkey_operator(cls.layout, "Add", "S_A", "Create a new annotation") + if object_type in ("ELEVATION", "SECTION"): + row = cls.layout.row(align=True) + row.prop(cls.props, "is_manual_reference") + _DIMENSION_TYPES = {"DIMENSION", "RADIUS", "DIAMETER", "ANGLE", "PLAN_LEVEL", "SECTION_LEVEL"} if object_type in _DIMENSION_TYPES: row = cls.layout.row(align=True) row.prop(cls.props, "force_perpendicular_to_face") - if object_type in ("ELEVATION", "SECTION"): - row = cls.layout.row(align=True) - row.prop(cls.props, "is_manual_reference") - if object_type in tool.Drawing.ANNOTATION_TYPES_SUPPORT_SETUP: row = cls.layout.row(align=True) row.label(text="", icon="DRIVER_ROTATIONAL_DIFFERENCE")