diff options
| author | Franklin Sobrinho | 2016-08-17 17:14:51 -0300 |
|---|---|---|
| committer | Rémi Verschelde | 2016-09-01 08:41:04 +0200 |
| commit | f9aeb9185067729b3ce7ca716f1d2d5749630667 (patch) | |
| tree | 3fa2d91fdccf46b8c777c69d518d2e69f93206d4 /tools/editor/plugins/sprite_frames_editor_plugin.cpp | |
| parent | 71a9efe604720a67226330f5c16ef99968ce783d (diff) | |
| download | godot-f9aeb9185067729b3ce7ca716f1d2d5749630667.tar.gz godot-f9aeb9185067729b3ce7ca716f1d2d5749630667.tar.zst godot-f9aeb9185067729b3ce7ca716f1d2d5749630667.zip | |
Implemented UndoRedo mergeable modes
(cherry picked from commit debf574df35caf8e0880b65120e3c79c45e1c92a)
Diffstat (limited to 'tools/editor/plugins/sprite_frames_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/sprite_frames_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/plugins/sprite_frames_editor_plugin.cpp b/tools/editor/plugins/sprite_frames_editor_plugin.cpp index e29a0c8d5..41beaa96a 100644 --- a/tools/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/tools/editor/plugins/sprite_frames_editor_plugin.cpp @@ -524,7 +524,7 @@ void SpriteFramesEditor::_animation_fps_changed(double p_value) { if (updating) return; - undo_redo->create_action(TTR("Change Animation FPS"),true); + undo_redo->create_action(TTR("Change Animation FPS"),UndoRedo::MERGE_ENDS); undo_redo->add_do_method(frames,"set_animation_speed",edited_anim,p_value); undo_redo->add_undo_method(frames,"set_animation_speed",edited_anim,frames->get_animation_speed(edited_anim)); undo_redo->add_do_method(this,"_update_library",true); |