From 589c5698a0808fb2ad9f240d65c1f44ad6544834 Mon Sep 17 00:00:00 2001 From: Angeloss Date: Mon, 25 Mar 2019 17:02:11 -0600 Subject: [PATCH] Fix: Keep custom tracks option now keeps animation loop property and value track update mode. --- editor/import/resource_importer_scene.cpp | 1 + scene/resources/animation.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index 5eb1d2ec6ca..fb2e3c0401a 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -942,6 +942,7 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String old_anim->copy_track(i, anim); } } + anim->set_loop(old_anim->has_loop()); } } diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 3eb16c544c7..f73914b186f 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -2638,6 +2638,7 @@ void Animation::copy_track(int p_track, Ref p_to_animation) { p_to_animation->track_set_enabled(dst_track, track_is_enabled(p_track)); p_to_animation->track_set_interpolation_type(dst_track, track_get_interpolation_type(p_track)); p_to_animation->track_set_interpolation_loop_wrap(dst_track, track_get_interpolation_loop_wrap(p_track)); + p_to_animation->value_track_set_update_mode(dst_track, value_track_get_update_mode(p_track)); for (int i = 0; i < track_get_key_count(p_track); i++) { p_to_animation->track_insert_key(dst_track, track_get_key_time(p_track, i), track_get_key_value(p_track, i), track_get_key_transition(p_track, i)); }