From 5129d2016ed4556054b170a9a027cd64302b0bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?= Date: Mon, 30 Sep 2024 13:15:19 -0300 Subject: [PATCH] Fix rebase conflicts --- src/bonsai/bonsai/bim/module/project/decorator.py | 4 ++-- src/bonsai/bonsai/tool/snap.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/project/decorator.py b/src/bonsai/bonsai/bim/module/project/decorator.py index bea8e9d5c6..54a4e7181c 100644 --- a/src/bonsai/bonsai/bim/module/project/decorator.py +++ b/src/bonsai/bonsai/bim/module/project/decorator.py @@ -330,6 +330,6 @@ class MeasureDecorator: # Draw polyline with selected points self.line_shader.uniform_float("lineWidth", 2.0) - self.draw_batch("POINTS", polyline_points, decorator_color_unselected) + self.draw_batch("POINTS", polyline_points, decorator_color_special) if len(polyline_points) > 1: - self.draw_batch("LINES", polyline_points, decorator_color_unselected, polyline_edges) + self.draw_batch("LINES", polyline_points, decorator_color_special, polyline_edges) diff --git a/src/bonsai/bonsai/tool/snap.py b/src/bonsai/bonsai/tool/snap.py index 0c0160eb28..0b91517323 100644 --- a/src/bonsai/bonsai/tool/snap.py +++ b/src/bonsai/bonsai/tool/snap.py @@ -171,7 +171,6 @@ class Snap(bonsai.core.tool.Snap): @classmethod def snap_on_axis(cls, intersection, tool_state, lock_angle=False): - def create_axis_line_data(rot_mat, origin): length = 1000 direction = Vector((1, 0, 0)) @@ -396,7 +395,6 @@ class Snap(bonsai.core.tool.Snap): measure_data = context.scene.BIMPolylineProperties.measure_polyline for measure in measure_data: measure_points = measure.polyline_point - print("points", measure_points) snap_points = tool.Raycast.ray_cast_to_measure(context, event, measure_points) if snap_points: detected_snaps.append({"Polyline": snap_points})