diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-10 23:56:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-10 23:56:49 +0100 |
| commit | 14c9316f45f8108e6156fc42a7b56c517577ecf8 (patch) | |
| tree | 3e9b31ff112afb49bc462e584bcc9345b4f0e0b0 | |
| parent | 1fe56e2bfbd1ec113a05d737b1f7a2ed9384fcde (diff) | |
| parent | dfb713bce6b4264269bac38150a231cd8aa2b76a (diff) | |
Merge pull request #34997 from fire/loop-fbx-32678
Use cycle and loop hint flags in FBX.
| -rw-r--r-- | modules/assimp/editor_scene_importer_assimp.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp index 1bc84ce3a0..726f4c1ed0 100644 --- a/modules/assimp/editor_scene_importer_assimp.cpp +++ b/modules/assimp/editor_scene_importer_assimp.cpp @@ -732,6 +732,10 @@ void EditorSceneImporterAssimp::_import_animation(ImportState &state, int p_anim animation->set_name(name); animation->set_length(anim->mDuration / ticks_per_second); + if (name.begins_with("loop") || name.ends_with("loop") || name.begins_with("cycle") || name.ends_with("cycle")) { + animation->set_loop(true); + } + // generate bone stack for animation import RegenerateBoneStack(state); |