From 7fcb7c643335dfe45424ff392ea7b6b7dcb4a5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?= Date: Sat, 18 Jan 2025 12:17:28 -0300 Subject: [PATCH] Allow moving the current aggregate/nest when aggregate/nest mode is active --- src/bonsai/bonsai/bim/module/geometry/operator.py | 4 ++++ src/bonsai/bonsai/tool/aggregate.py | 1 + src/bonsai/bonsai/tool/nest.py | 1 + 3 files changed, 6 insertions(+) diff --git a/src/bonsai/bonsai/bim/module/geometry/operator.py b/src/bonsai/bonsai/bim/module/geometry/operator.py index bb281abb14..48168cc6c8 100644 --- a/src/bonsai/bonsai/bim/module/geometry/operator.py +++ b/src/bonsai/bonsai/bim/module/geometry/operator.py @@ -3046,6 +3046,8 @@ class OverrideMove(bpy.types.Operator): if obj in not_editing_objs: obj.select_set(False) continue + if obj == props.editing_aggregate: + continue element = tool.Ifc.get_entity(obj) if not element or not element.is_a("IfcElement"): continue @@ -3079,6 +3081,8 @@ class OverrideMove(bpy.types.Operator): if obj in not_editing_objs: obj.select_set(False) continue + if obj == props.editing_nest: + continue element = tool.Ifc.get_entity(obj) if not element or not element.is_a("IfcElement"): continue diff --git a/src/bonsai/bonsai/tool/aggregate.py b/src/bonsai/bonsai/tool/aggregate.py index e78641276f..4ad7a95425 100644 --- a/src/bonsai/bonsai/tool/aggregate.py +++ b/src/bonsai/bonsai/tool/aggregate.py @@ -145,3 +145,4 @@ class Aggregate(bonsai.core.tool.Aggregate): props.in_aggregate_mode = False props.not_editing_objects.clear() props.editing_objects.clear() + props.editing_aggregate = None diff --git a/src/bonsai/bonsai/tool/nest.py b/src/bonsai/bonsai/tool/nest.py index 99b87cf912..a4f0dc20ec 100644 --- a/src/bonsai/bonsai/tool/nest.py +++ b/src/bonsai/bonsai/tool/nest.py @@ -120,3 +120,4 @@ class Nest(bonsai.core.tool.Nest): props.in_nest_mode = False props.not_editing_objects.clear() props.editing_objects.clear() + props.editing_nest = None