From 875e06ce898a255443f99fa267c4be28e3ad688c Mon Sep 17 00:00:00 2001 From: dennmar Date: Sun, 9 Nov 2025 17:59:30 -0800 Subject: [PATCH] Fix merge conflict after rebase --- editor/scene/canvas_item_editor_plugin.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp index c7aac9c602c..4a58c1bee19 100644 --- a/editor/scene/canvas_item_editor_plugin.cpp +++ b/editor/scene/canvas_item_editor_plugin.cpp @@ -1524,12 +1524,16 @@ bool CanvasItemEditor::_gui_input_pivot(const Ref &p_event) { ((b.is_valid() && !b->is_pressed() && b->get_button_index() == MouseButton::LEFT && tool == TOOL_EDIT_PIVOT) || (k.is_valid() && !k->is_pressed() && k->get_keycode() == Key::V))) { _commit_drag(); + snap_target[0] = SNAP_TARGET_NONE; + snap_target[1] = SNAP_TARGET_NONE; return true; } // Cancel a drag if (ED_IS_SHORTCUT("canvas_item_editor/cancel_transform", p_event) || (b.is_valid() && b->get_button_index() == MouseButton::RIGHT && b->is_pressed())) { _restore_canvas_item_state(drag_selection); + snap_target[0] = SNAP_TARGET_NONE; + snap_target[1] = SNAP_TARGET_NONE; _reset_drag(); viewport->queue_redraw(); return true;