summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-04-25 16:58:30 +0200
committerGitHub <noreply@github.com>2022-04-25 16:58:30 +0200
commit3ff0cc5c1c702455f0be99972865eb9ad187f947 (patch)
tree3b03103aef1e765edb6345aaa75e7a3b6747d419
parentac4e322ac8c1beb866d5a8d4ac1f52de2d490262 (diff)
parenta384031326b96dd1185b7ba33809660ba5551549 (diff)
Merge pull request #60401 from fire-forge/gradient-undoredo
-rw-r--r--editor/plugins/gradient_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp
index e9d7808684..1386f03662 100644
--- a/editor/plugins/gradient_editor_plugin.cpp
+++ b/editor/plugins/gradient_editor_plugin.cpp
@@ -55,7 +55,7 @@ void GradientEditor::_gradient_changed() {
void GradientEditor::_ramp_changed() {
editing = true;
UndoRedo *undo_redo = EditorNode::get_singleton()->get_undo_redo();
- undo_redo->create_action(TTR("Gradient Edited"));
+ undo_redo->create_action(TTR("Gradient Edited"), UndoRedo::MERGE_ENDS);
undo_redo->add_do_method(gradient.ptr(), "set_offsets", get_offsets());
undo_redo->add_do_method(gradient.ptr(), "set_colors", get_colors());
undo_redo->add_do_method(gradient.ptr(), "set_interpolation_mode", get_interpolation_mode());