diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-08-29 19:04:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 19:04:42 +0200 |
| commit | e51d59ed986374f32b08c57698fb73790b5e5b1d (patch) | |
| tree | 156419dbf54d1709c155dc7e608435716b1c8bba /tools/editor/plugins/sprite_frames_editor_plugin.cpp | |
| parent | 91a5c77282f0d5ce7008737f463c1ad27207b99c (diff) | |
| parent | debf574df35caf8e0880b65120e3c79c45e1c92a (diff) | |
| download | redot-engine-e51d59ed986374f32b08c57698fb73790b5e5b1d.tar.gz | |
Merge pull request #6188 from TheHX/undo-redo
Implemented UndoRedo mergeable modes
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 e29a0c8d52..41beaa96a1 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); |