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

Merge pull request #27254 from piyushdagar/fix-animation

Browse source 
Fixes Adding animation to AnimatedSprite doesn't update inspector immmediately #26381
This commit is contained in:
Rémi Verschelde 2019-04-05 15:28:28 +02:00 committed by GitHub
commit 570fa6a477
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/plugins/sprite_frames_editor_plugin.cpp
View file

@ -347,9 +347,6 @@ void SpriteFramesEditor::_animation_name_edited() {
for (List<Node *>::Element *E = nodes.front(); E; E = E->next()) { for (List<Node *>::Element *E = nodes.front(); E; E = E->next()) {
String current = E->get()->call("get_animation"); String current = E->get()->call("get_animation");
if (current != edited_anim)
continue;
undo_redo->add_do_method(E->get(), "set_animation", name); undo_redo->add_do_method(E->get(), "set_animation", name);
undo_redo->add_undo_method(E->get(), "set_animation", edited_anim); undo_redo->add_undo_method(E->get(), "set_animation", edited_anim);
} }
@ -382,9 +379,6 @@ void SpriteFramesEditor::_animation_add() {
for (List<Node *>::Element *E = nodes.front(); E; E = E->next()) { for (List<Node *>::Element *E = nodes.front(); E; E = E->next()) {
String current = E->get()->call("get_animation"); String current = E->get()->call("get_animation");
if (frames->has_animation(current))
continue;
undo_redo->add_do_method(E->get(), "set_animation", name); undo_redo->add_do_method(E->get(), "set_animation", name);
undo_redo->add_undo_method(E->get(), "set_animation", current); undo_redo->add_undo_method(E->get(), "set_animation", current);
} }