godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Implemented UndoRedo mergeable modes

Browse Source 
(cherry picked from commit debf574df3)
This commit is contained in:
Franklin Sobrinho
2016-08-17 17:14:51 -03:00
committed by Rémi Verschelde
parent 71a9efe604
commit f9aeb91850
8 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/editor/plugins/sprite_frames_editor_plugin.cpp
View File

@@ -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);