asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #71156 from EricEzaM/71113-cancelling-node-selection-with-escape-breaks-shape-editing-undo

Browse source 
Fix cancelling selection (pressing escape) while gizmo editing making uncommitted changes.
This commit is contained in:
Rémi Verschelde 2023-03-07 12:03:42 +01:00
commit c3c425c25f
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/plugins/collision_shape_2d_editor_plugin.cpp
View file

@ -356,6 +356,7 @@ bool CollisionShape2DEditor::forward_canvas_gui_input(const Ref<InputEvent> &p_e
return false;
}
original_point = handles[edit_handle];
original = get_handle_value(edit_handle);
original_transform = node->get_global_transform();
last_point = original;
@ -572,6 +573,11 @@ void CollisionShape2DEditor::edit(Node *p_node) {
_get_current_shape_type();
} else {
if (pressed) {
set_handle(edit_handle, original_point);
pressed = false;
}
edit_handle = -1;
shape_type = -1;

1
editor/plugins/collision_shape_2d_editor_plugin.h
View file

@ -71,6 +71,7 @@ class CollisionShape2DEditor : public Control {
bool pressed;
Variant original;
Transform2D original_transform;
Vector2 original_point;
Point2 last_point;
Variant get_handle_value(int idx) const;

5
editor/plugins/node_3d_editor_plugin.cpp
View file

@ -2103,6 +2103,11 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
}
if (_edit.mode == TRANSFORM_NONE) {
if (_edit.gizmo.is_valid()) {
// Restore.
_edit.gizmo->commit_handle(_edit.gizmo_handle, _edit.gizmo_handle_secondary, _edit.gizmo_initial_value, true);
_edit.gizmo = Ref<EditorNode3DGizmo>();
}
if (k->get_keycode() == Key::ESCAPE && !cursor.region_select) {
_clear_selected();
return;