asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #12566 from bncastle/select_anim_fix

Browse source 
Select correct animation on creation of a new one
This commit is contained in:
Rémi Verschelde 2017-11-02 14:21:09 +01:00 committed by GitHub
commit c880302754
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/plugins/sprite_frames_editor_plugin.cpp
View file

@ -365,13 +365,11 @@ void SpriteFramesEditor::_animation_name_edited() {
} }
void SpriteFramesEditor::_animation_add() { void SpriteFramesEditor::_animation_add() {
String new_name = "New Anim"; String name = "New Anim";
String name = new_name;
int counter = 0; int counter = 0;
while (frames->has_animation(name)) { while (frames->has_animation(name)) {
counter++; counter++;
name = new_name + " " + itos(counter); name = "New Anim " + itos(counter);
} }
List<Node *> nodes; List<Node *> nodes;
@ -393,7 +391,7 @@ void SpriteFramesEditor::_animation_add() {
undo_redo->add_undo_method(E->get(), "set_animation", current); undo_redo->add_undo_method(E->get(), "set_animation", current);
} }
edited_anim = new_name; edited_anim = name;
undo_redo->commit_action(); undo_redo->commit_action();
} }