diff options
| author | Rémi Verschelde | 2016-08-29 19:04:42 +0200 |
|---|---|---|
| committer | GitHub | 2016-08-29 19:04:42 +0200 |
| commit | e51d59ed986374f32b08c57698fb73790b5e5b1d (patch) | |
| tree | 156419dbf54d1709c155dc7e608435716b1c8bba /tools/editor/plugins/canvas_item_editor_plugin.cpp | |
| parent | 91a5c77282f0d5ce7008737f463c1ad27207b99c (diff) | |
| parent | debf574df35caf8e0880b65120e3c79c45e1c92a (diff) | |
| download | godot-e51d59ed986374f32b08c57698fb73790b5e5b1d.tar.gz godot-e51d59ed986374f32b08c57698fb73790b5e5b1d.tar.zst godot-e51d59ed986374f32b08c57698fb73790b5e5b1d.zip | |
Merge pull request #6188 from TheHX/undo-redo
Implemented UndoRedo mergeable modes
Diffstat (limited to 'tools/editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 66b24dab4..57707ffa7 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -648,7 +648,7 @@ void CanvasItemEditor::_key_move(const Vector2& p_dir, bool p_snap, KeyMoveMODE if (editor_selection->get_selected_node_list().empty()) return; - undo_redo->create_action(TTR("Move Action"),true); + undo_redo->create_action(TTR("Move Action"),UndoRedo::MERGE_ENDS); List<Node*> &selection = editor_selection->get_selected_node_list(); |