Merge pull request #5677 from SaracenOne/animation_import_fix

Removes AnimationPlayer renaming on import.
This commit is contained in:
Juan Linietsky 2016-07-13 12:49:09 -03:00 committed by GitHub
commit 1403fa18a9

View file

@ -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); state.create_animations(p_flags&IMPORT_ANIMATION_FORCE_ALL_TRACKS_IN_ALL_CLIPS);
AnimationPlayer *ap = memnew( AnimationPlayer ); AnimationPlayer *ap = memnew( AnimationPlayer );
ap->set_name("animations");
for(int i=0;i<state.animations.size();i++) { for(int i=0;i<state.animations.size();i++) {
String name; String name;
if (state.animations[i]->get_name()=="") if (state.animations[i]->get_name()=="")