Skip to content

Commit

Permalink
Merge pull request #27419 from GameCoderStudios/keep-custom-tracks-pr…
Browse files Browse the repository at this point in the history
…operties

Fix: Keep-custom-tracks option now keeps animation loop property and value track update mode.
  • Loading branch information
akien-mga authored Apr 1, 2019
2 parents f4578e1 + 589c569 commit 7f691e8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions editor/import/resource_importer_scene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}

Expand Down
1 change: 1 addition & 0 deletions scene/resources/animation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2638,6 +2638,7 @@ 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));
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));
}
Expand Down

0 comments on commit 7f691e8

Please sign in to comment.