Преглед на файлове

Fix UndoRedo in Gradient editor

(cherry picked from commit a384031326b96dd1185b7ba33809660ba5551549)
FireForge преди 3 години
родител
ревизия
994c0b7ce5
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      editor/plugins/gradient_editor_plugin.cpp

+ 1 - 1
editor/plugins/gradient_editor_plugin.cpp

@@ -51,7 +51,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_undo_method(gradient.ptr(), "set_offsets", gradient->get_offsets());