diff --git a/scripts/addons/contour_tools/__init__.py b/scripts/addons/contour_tools/__init__.py index f9a1e43..b4c6462 100644 --- a/scripts/addons/contour_tools/__init__.py +++ b/scripts/addons/contour_tools/__init__.py @@ -1173,14 +1173,16 @@ def modal(self, context, event): #user just finished using the widget if self.drag_target.desc == 'CUT_LINE' and self.widget_interaction: - if not settings.live_update: + if not settings.live_update: #meaning all this hasn't been done self.drag_target.hit_object(context, self.original_form, method = '3_AXIS_COM') self.drag_target.cut_object(context, self.original_form, self.bme) self.hover_target.simplify_cross(self.segments) self.hover_target.update_com() self.hover_target.update_screen_coords(context) - self.align_cut(self.drag_target, mode = 'BETWEEN') + if self.cut_line_widget.transform: + self.align_cut(self.drag_target, mode = 'BETWEEN') + self.connect_valid_cuts_to_make_mesh() diff --git a/scripts/addons/contour_tools/contour_classes.py b/scripts/addons/contour_tools/contour_classes.py index 192b295..bb131cb 100644 --- a/scripts/addons/contour_tools/contour_classes.py +++ b/scripts/addons/contour_tools/contour_classes.py @@ -1303,6 +1303,8 @@ def __init__(self,context, settings, cut_line,x,y,cut_line_a = None, cut_line_b self.vec_y = self.cut_line.vec_y.copy() self.initial_plane_no = self.cut_line.plane_no.copy() self.initial_seed = self.cut_line.seed_face_index + self.initial_int_shift = self.cut_line.int_shift + self.initial_shift = self.cut_line.shift self.wedge_1 = [] self.wedge_2 = [] @@ -1644,6 +1646,7 @@ def derive_screen(self,context): def cancel_transform(self): + self.cut_line = ContourCutLine #reset our initial values self.cut_line.plane_com = self.initial_com self.cut_line.plane_no = self.initial_plane_no @@ -1651,6 +1654,9 @@ def cancel_transform(self): self.cut_line.vec_x = self.vec_x self.cut_line.vec_y = self.vec_y self.cut_line.seed_face_index = self.initial_seed + + self.cut_line.int_shift = self.initial_int_shift + self.cut_line.shift = self.initial_shift def draw(self, context):