diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-04 08:00:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-04 08:00:21 +0200 |
| commit | ec8f44ed5f7eb2de54f7a35b1764113678a657a0 (patch) | |
| tree | 76b13bf15cea95863cb5a1a27d5a13913a1bd0a7 /editor | |
| parent | fe3b8b48dd21d222ef2209c7cb5af16f86755e00 (diff) | |
| parent | 00ccaa5559c065bc2ce3bda1b748da8b036301fb (diff) | |
Merge pull request #10895 from Paulb23/fix_delete_animation_frames
Fixed delete animation frames in AnimatedSprite, issue 10788
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/sprite_frames_editor_plugin.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index c2c26bfe6c..7b40f69082 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -244,8 +244,22 @@ void SpriteFramesEditor::_down_pressed() { void SpriteFramesEditor::_delete_pressed() { + ERR_FAIL_COND(!frames->has_animation(edited_anim)); + if (tree->get_current() < 0) return; + + int to_delete = tree->get_current(); + if (to_delete < 0 || to_delete >= frames->get_frame_count(edited_anim)) { + return; + } + + undo_redo->create_action(TTR("Delete Resource")); + undo_redo->add_do_method(frames, "remove_frame", edited_anim, to_delete); + undo_redo->add_undo_method(frames, "add_frame", edited_anim, frames->get_frame(edited_anim, to_delete), to_delete); + undo_redo->add_do_method(this, "_update_library"); + undo_redo->add_undo_method(this, "_update_library"); + undo_redo->commit_action(); } void SpriteFramesEditor::_animation_select() { |