godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Fix errors when locking nodes

Browse Source
This commit is contained in:
Michael Alexsander
2022-03-27 16:10:57 -03:00
parent f0407ad14d
commit c331a3a614
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -4324,8 +4324,8 @@ void CanvasItemEditor::_popup_callback(int p_op) {
undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed"); undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed");
undo_redo->add_undo_method(this, "emit_signal", "item_lock_status_changed"); undo_redo->add_undo_method(this, "emit_signal", "item_lock_status_changed");
} }
undo_redo->add_do_method(viewport, "update", Variant()); undo_redo->add_do_method(viewport, "update");
undo_redo->add_undo_method(viewport, "update", Variant()); undo_redo->add_undo_method(viewport, "update");
undo_redo->commit_action(); undo_redo->commit_action();
} break; } break;
case UNLOCK_SELECTED: { case UNLOCK_SELECTED: {
@@ -4346,8 +4346,8 @@ void CanvasItemEditor::_popup_callback(int p_op) {
undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed"); undo_redo->add_do_method(this, "emit_signal", "item_lock_status_changed");
undo_redo->add_undo_method(this, "emit_signal", "item_lock_status_changed"); undo_redo->add_undo_method(this, "emit_signal", "item_lock_status_changed");
} }
undo_redo->add_do_method(viewport, "update", Variant()); undo_redo->add_do_method(viewport, "update");
undo_redo->add_undo_method(viewport, "update", Variant()); undo_redo->add_undo_method(viewport, "update");
undo_redo->commit_action(); undo_redo->commit_action();
} break; } break;
case GROUP_SELECTED: { case GROUP_SELECTED: {
@@ -4368,8 +4368,8 @@ void CanvasItemEditor::_popup_callback(int p_op) {
undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed"); undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed");
undo_redo->add_undo_method(this, "emit_signal", "item_group_status_changed"); undo_redo->add_undo_method(this, "emit_signal", "item_group_status_changed");
} }
undo_redo->add_do_method(viewport, "update", Variant()); undo_redo->add_do_method(viewport, "update");
undo_redo->add_undo_method(viewport, "update", Variant()); undo_redo->add_undo_method(viewport, "update");
undo_redo->commit_action(); undo_redo->commit_action();
} break; } break;
case UNGROUP_SELECTED: { case UNGROUP_SELECTED: {
@@ -4390,8 +4390,8 @@ void CanvasItemEditor::_popup_callback(int p_op) {
undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed"); undo_redo->add_do_method(this, "emit_signal", "item_group_status_changed");
undo_redo->add_undo_method(this, "emit_signal", "item_group_status_changed"); undo_redo->add_undo_method(this, "emit_signal", "item_group_status_changed");
} }
undo_redo->add_do_method(viewport, "update", Variant()); undo_redo->add_do_method(viewport, "update");
undo_redo->add_undo_method(viewport, "update", Variant()); undo_redo->add_undo_method(viewport, "update");
undo_redo->commit_action(); undo_redo->commit_action();
} break; } break;

8
editor/scene_tree_editor.cpp
View File

@@ -96,8 +96,8 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
if (n->is_class("CanvasItem") || n->is_class("Node3D")) { if (n->is_class("CanvasItem") || n->is_class("Node3D")) {
undo_redo->add_do_method(n, "remove_meta", "_edit_lock_"); undo_redo->add_do_method(n, "remove_meta", "_edit_lock_");
undo_redo->add_undo_method(n, "set_meta", "_edit_lock_", true); undo_redo->add_undo_method(n, "set_meta", "_edit_lock_", true);
undo_redo->add_do_method(this, "_update_tree", Variant()); undo_redo->add_do_method(this, "_update_tree");
undo_redo->add_undo_method(this, "_update_tree", Variant()); undo_redo->add_undo_method(this, "_update_tree");
undo_redo->add_do_method(this, "emit_signal", "node_changed"); undo_redo->add_do_method(this, "emit_signal", "node_changed");
undo_redo->add_undo_method(this, "emit_signal", "node_changed"); undo_redo->add_undo_method(this, "emit_signal", "node_changed");
} }
@@ -114,8 +114,8 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
if (n->is_class("CanvasItem") || n->is_class("Node3D")) { if (n->is_class("CanvasItem") || n->is_class("Node3D")) {
undo_redo->add_do_method(n, "remove_meta", "_edit_group_"); undo_redo->add_do_method(n, "remove_meta", "_edit_group_");
undo_redo->add_undo_method(n, "set_meta", "_edit_group_", true); undo_redo->add_undo_method(n, "set_meta", "_edit_group_", true);
undo_redo->add_do_method(this, "_update_tree", Variant()); undo_redo->add_do_method(this, "_update_tree");
undo_redo->add_undo_method(this, "_update_tree", Variant()); undo_redo->add_undo_method(this, "_update_tree");
undo_redo->add_do_method(this, "emit_signal", "node_changed"); undo_redo->add_do_method(this, "emit_signal", "node_changed");
undo_redo->add_undo_method(this, "emit_signal", "node_changed"); undo_redo->add_undo_method(this, "emit_signal", "node_changed");
} }