diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-07-13 12:49:09 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 12:49:09 -0300 |
| commit | 1403fa18a9cf1077d9b7ec974ee9f77249ae49b6 (patch) | |
| tree | f25dd182e939314bdfdef6c7461078b8f6653c31 /tools | |
| parent | 5545afd52b912722bbdb6e412cce9593857c5726 (diff) | |
| parent | ca866803bec602c595f0590977fe619194c19c27 (diff) | |
Merge pull request #5677 from SaracenOne/animation_import_fix
Removes AnimationPlayer renaming on import.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/io_plugins/editor_import_collada.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp index fc45b51a98..1130e2be30 100644 --- a/tools/editor/io_plugins/editor_import_collada.cpp +++ b/tools/editor/io_plugins/editor_import_collada.cpp @@ -2375,7 +2375,6 @@ Node* EditorSceneImporterCollada::import_scene(const String& p_path, uint32_t p_ state.create_animations(p_flags&IMPORT_ANIMATION_FORCE_ALL_TRACKS_IN_ALL_CLIPS); AnimationPlayer *ap = memnew( AnimationPlayer ); - ap->set_name("animations"); for(int i=0;i<state.animations.size();i++) { String name; if (state.animations[i]->get_name()=="") |