summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorlordkettune <lefox2@gmail.com>2020-06-29 19:10:18 -0700
committerlordkettune <lefox2@gmail.com>2020-07-02 16:08:20 -0700
commit4313a7bdc857e7e32a5c71b931e8c02b29416e3c (patch)
treee3da9d821e3af283181833036a45c63b7f5c9a7c /scene/resources
parentc85a51cf87f04ff296678d563dc9299598d2bfae (diff)
Fix issues with custom tracks on reimport
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/animation.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index 014b773298..479d97aadc 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -2577,7 +2577,10 @@ void Animation::copy_track(int p_track, Ref<Animation> 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));
+ if (track_get_type(p_track) == TYPE_VALUE) {
+ 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));
}