From ddd17d519ebe2511bda408476d998f9b4f836920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?= Date: Wed, 9 Oct 2024 10:19:51 -0300 Subject: [PATCH] Fix error that was preventing 3d panning while polyline tool is active. This error was introduced by 48784ba --- src/bonsai/bonsai/bim/module/model/wall.py | 5 +++-- src/bonsai/bonsai/bim/module/project/operator.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/model/wall.py b/src/bonsai/bonsai/bim/module/model/wall.py index 728004f126..370b552cc4 100644 --- a/src/bonsai/bonsai/bim/module/model/wall.py +++ b/src/bonsai/bonsai/bim/module/model/wall.py @@ -324,7 +324,9 @@ class DrawPolylineWall(bpy.types.Operator, PolylineOperator): PolylineDecorator.update(event, self.tool_state, self.input_ui, self.snapping_points[0]) tool.Blender.update_viewport() - if not event.shift and event.type in {"MIDDLEMOUSE", "WHEELUPMOUSE", "WHEELDOWNMOUSE"}: + self.handle_lock_axis(context, event) + + if event.type in {"MIDDLEMOUSE", "WHEELUPMOUSE", "WHEELDOWNMOUSE"}: self.handle_mouse_move(context, event) return {"PASS_THROUGH"} @@ -334,7 +336,6 @@ class DrawPolylineWall(bpy.types.Operator, PolylineOperator): self.choose_axis(event) - self.handle_lock_axis(context, event) self.handle_snap_selection(context, event) diff --git a/src/bonsai/bonsai/bim/module/project/operator.py b/src/bonsai/bonsai/bim/module/project/operator.py index 0db8f48b89..0554a13404 100644 --- a/src/bonsai/bonsai/bim/module/project/operator.py +++ b/src/bonsai/bonsai/bim/module/project/operator.py @@ -2401,7 +2401,9 @@ class MeasureTool(bpy.types.Operator, PolylineOperator): PolylineDecorator.update(event, self.tool_state, self.input_ui, self.snapping_points[0]) tool.Blender.update_viewport() - if not event.shift and event.type in {"MIDDLEMOUSE", "WHEELUPMOUSE", "WHEELDOWNMOUSE"}: + self.handle_lock_axis(context, event) + + if event.type in {"MIDDLEMOUSE", "WHEELUPMOUSE", "WHEELDOWNMOUSE"}: self.handle_mouse_move(context, event) return {"PASS_THROUGH"} @@ -2411,7 +2413,6 @@ class MeasureTool(bpy.types.Operator, PolylineOperator): self.choose_axis(event, z=True) - self.handle_lock_axis(context, event) self.choose_plane(event)